Patchwork Remove unused parameter of xfrm_gen_index()

login
register
mail settings
Submitter Arnaud Ebalard
Date Nov. 12, 2008, 1:10 p.m.
Message ID <87zlk5ccpg.fsf@natisbad.org>
Download mbox | patch
Permalink /patch/8374/
State Accepted
Delegated to: David Miller
Headers show

Comments

Arnaud Ebalard - Nov. 12, 2008, 1:10 p.m.
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 <arno@natisbad.org>
---
 net/xfrm/xfrm_policy.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Herbert Xu - Nov. 13, 2008, 2:01 a.m.
On Wed, Nov 12, 2008 at 02:10:03PM +0100, Arnaud Ebalard wrote:
> 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 <arno@natisbad.org>

Looks good to me.

Acked-by: Herbert Xu <herbert@gondor.apana.org.au>

Cheers,
David Miller - Nov. 13, 2008, 7:28 a.m.
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 13 Nov 2008 10:01:02 +0800

> On Wed, Nov 12, 2008 at 02:10:03PM +0100, Arnaud Ebalard wrote:
> > 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 <arno@natisbad.org>
> 
> Looks good to me.
> 
> Acked-by: Herbert Xu <herbert@gondor.apana.org.au>

Applied, thanks everyone.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 058f04f..959958c 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -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)