Skip to contentSkip to conversation

Remove unused parameter of xfrm_gen_index()

PATCH Applied Arnaud Ebalard 3 participants 3 messages Nov 12, 2008 – Nov 13, 2008

Subsystems (3)
Networking Network drivers Networking IPsec
lore
Share & tools
lore

Arnaud Ebalard

author
#0 lore raw

PATCH 1/1 Remove unused parameter of xfrm_gen_index()

Hi David,

In commit 2518c7c2b3d7f0a6b302b4efe17c911f8dd4049f, the last use of xfrm_gen_policy() first argument was removed, but the argument was left behind in the prototype. Patch is against current net-2.6.

Signed-off-by Arnaud Ebalard <[email protected]>
---
 net/xfrm/xfrm_policy.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
net/xfrm/xfrm_policy.c +3 -3
index 058f04f..959958c 100644
@@ -521,7 +521,7 @@ static DECLARE_WORK(xfrm_hash_work, xfrm_hash_resize);
 
 /* Generate new index... KAME seems to generate them ordered by cost
  * of an absolute inpredictability of ordering of rules. This will not pass. */
-static u32 xfrm_gen_index(u8 type, int dir)
+static u32 xfrm_gen_index(int dir)
 {
 	static u32 idx_generator;
 

@@ -608,7 +608,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
 		list_del(&delpol->walk.all);
 		xfrm_policy_count[dir]--;
 	}
-	policy->index = delpol ? delpol->index : xfrm_gen_index(policy->type, dir);
+	policy->index = delpol ? delpol->index : xfrm_gen_index(dir);
 	hlist_add_head(&policy->byidx, xfrm_policy_byidx+idx_hash(policy->index));
 	policy->curlft.add_time = get_seconds();
 	policy->curlft.use_time = 0;

@@ -1138,7 +1138,7 @@ int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol)
 	sk->sk_policy[dir] = pol;
 	if (pol) {
 		pol->curlft.add_time = get_seconds();
-		pol->index = xfrm_gen_index(pol->type, XFRM_POLICY_MAX+dir);
+		pol->index = xfrm_gen_index(XFRM_POLICY_MAX+dir);
 		__xfrm_policy_link(pol, XFRM_POLICY_MAX+dir);
 	}
 	if (old_pol)
Signature · 1 line
1.5.6.5
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Arnaud Ebalard

Hi David,

In commit 2518c7c2b3d7f0a6b302b4efe17c911f8dd4049f, the last use of xfrm_gen_policy() first argument was removed, but the argument was left behind in the prototype. Patch is against current net-2.6.

Signed-off-by Arnaud Ebalard <[email protected]>

Looks good to me.

Acked-by Herbert Xu <[email protected]>

Cheers,

Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
maintainer Applied
#2 lore raw

From: Herbert Xu <[email protected]>
Date: Thu, 13 Nov 2008 10:01:02 +0800

Quoted 7 lines · Arnaud Ebalard
Quoted 6 lines

Hi David,

In commit 2518c7c2b3d7f0a6b302b4efe17c911f8dd4049f, the last use of xfrm_gen_policy() first argument was removed, but the argument was left behind in the prototype. Patch is against current net-2.6.

Quoted 5 lines
Quoted 1 line
Signed-off-by Arnaud Ebalard <[email protected]>

Looks good to me.

Acked-by Herbert Xu <[email protected]>

Applied, thanks everyone.