Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a12122c authored by Arnaud Ebalard's avatar Arnaud Ebalard Committed by David S. Miller
Browse files

net: Remove unused parameter of xfrm_gen_index() 



In commit 2518c7c2 ("[XFRM]: Hash
policies when non-prefixed."), the last use of xfrm_gen_policy() first
argument was removed, but the argument was left behind in the
prototype.

Signed-off-by: default avatarArnaud Ebalard <arno@natisbad.org>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 23789824

net/xfrm/xfrm_policy.c

+3 −3
Original line number Diff line number Diff line
@@ -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)