Commit 0de19788 authored by Hongbin Wang's avatar Hongbin Wang Committed by Steffen Klassert
Browse files

xfrm: Drop unused argument 



Drop unused argument from xfrm_policy_match,
__xfrm_policy_eval_candidates and xfrm_policy_eval_candidates.
No functional changes intended.

Signed-off-by: default avatarHongbin Wang <wh_bin@126.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 93d7c52a

net/xfrm/xfrm_policy.c

+7 −8
Original line number Diff line number Diff line
@@ -1889,7 +1889,7 @@ EXPORT_SYMBOL(xfrm_policy_walk_done); 
 */

static int xfrm_policy_match(const struct xfrm_policy *pol,

			     const struct flowi *fl,

			     u8 type, u16 family, int dir, u32 if_id)

			     u8 type, u16 family, u32 if_id)

{

	const struct xfrm_selector *sel = &pol->selector;

	int ret = -ESRCH;
@@ -2014,7 +2014,7 @@ static struct xfrm_policy * 
__xfrm_policy_eval_candidates(struct hlist_head *chain,

			      struct xfrm_policy *prefer,

			      const struct flowi *fl,

			      u8 type, u16 family, int dir, u32 if_id)

			      u8 type, u16 family, u32 if_id)

{

	u32 priority = prefer ? prefer->priority : ~0u;

	struct xfrm_policy *pol;
@@ -2028,7 +2028,7 @@ __xfrm_policy_eval_candidates(struct hlist_head *chain, 
		if (pol->priority > priority)

			break;



		err = xfrm_policy_match(pol, fl, type, family, dir, if_id);

		err = xfrm_policy_match(pol, fl, type, family, if_id);

		if (err) {

			if (err != -ESRCH)

				return ERR_PTR(err);
@@ -2053,7 +2053,7 @@ static struct xfrm_policy * 
xfrm_policy_eval_candidates(struct xfrm_pol_inexact_candidates *cand,

			    struct xfrm_policy *prefer,

			    const struct flowi *fl,

			    u8 type, u16 family, int dir, u32 if_id)

			    u8 type, u16 family, u32 if_id)

{

	struct xfrm_policy *tmp;

	int i;
@@ -2061,8 +2061,7 @@ xfrm_policy_eval_candidates(struct xfrm_pol_inexact_candidates *cand, 
	for (i = 0; i < ARRAY_SIZE(cand->res); i++) {

		tmp = __xfrm_policy_eval_candidates(cand->res[i],

						    prefer,

						    fl, type, family, dir,

						    if_id);

						    fl, type, family, if_id);

		if (!tmp)

			continue;
@@ -2101,7 +2100,7 @@ static struct xfrm_policy *xfrm_policy_lookup_bytype(struct net *net, u8 type, 


	ret = NULL;

	hlist_for_each_entry_rcu(pol, chain, bydst) {

		err = xfrm_policy_match(pol, fl, type, family, dir, if_id);

		err = xfrm_policy_match(pol, fl, type, family, if_id);

		if (err) {

			if (err == -ESRCH)

				continue;
@@ -2120,7 +2119,7 @@ static struct xfrm_policy *xfrm_policy_lookup_bytype(struct net *net, u8 type, 
		goto skip_inexact;



	pol = xfrm_policy_eval_candidates(&cand, ret, fl, type,

					  family, dir, if_id);

					  family, if_id);

	if (pol) {

		ret = pol;

		if (IS_ERR(pol))