Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Hongbin Wang <wh_bin@126.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

authored by

Hongbin Wang and committed by
Steffen Klassert
0de19788 93d7c52a

+7 -8
+7 -8
net/xfrm/xfrm_policy.c
··· 1889 1889 */ 1890 1890 static int xfrm_policy_match(const struct xfrm_policy *pol, 1891 1891 const struct flowi *fl, 1892 - u8 type, u16 family, int dir, u32 if_id) 1892 + u8 type, u16 family, u32 if_id) 1893 1893 { 1894 1894 const struct xfrm_selector *sel = &pol->selector; 1895 1895 int ret = -ESRCH; ··· 2014 2014 __xfrm_policy_eval_candidates(struct hlist_head *chain, 2015 2015 struct xfrm_policy *prefer, 2016 2016 const struct flowi *fl, 2017 - u8 type, u16 family, int dir, u32 if_id) 2017 + u8 type, u16 family, u32 if_id) 2018 2018 { 2019 2019 u32 priority = prefer ? prefer->priority : ~0u; 2020 2020 struct xfrm_policy *pol; ··· 2028 2028 if (pol->priority > priority) 2029 2029 break; 2030 2030 2031 - err = xfrm_policy_match(pol, fl, type, family, dir, if_id); 2031 + err = xfrm_policy_match(pol, fl, type, family, if_id); 2032 2032 if (err) { 2033 2033 if (err != -ESRCH) 2034 2034 return ERR_PTR(err); ··· 2053 2053 xfrm_policy_eval_candidates(struct xfrm_pol_inexact_candidates *cand, 2054 2054 struct xfrm_policy *prefer, 2055 2055 const struct flowi *fl, 2056 - u8 type, u16 family, int dir, u32 if_id) 2056 + u8 type, u16 family, u32 if_id) 2057 2057 { 2058 2058 struct xfrm_policy *tmp; 2059 2059 int i; ··· 2061 2061 for (i = 0; i < ARRAY_SIZE(cand->res); i++) { 2062 2062 tmp = __xfrm_policy_eval_candidates(cand->res[i], 2063 2063 prefer, 2064 - fl, type, family, dir, 2065 - if_id); 2064 + fl, type, family, if_id); 2066 2065 if (!tmp) 2067 2066 continue; 2068 2067 ··· 2100 2101 2101 2102 ret = NULL; 2102 2103 hlist_for_each_entry_rcu(pol, chain, bydst) { 2103 - err = xfrm_policy_match(pol, fl, type, family, dir, if_id); 2104 + err = xfrm_policy_match(pol, fl, type, family, if_id); 2104 2105 if (err) { 2105 2106 if (err == -ESRCH) 2106 2107 continue; ··· 2119 2120 goto skip_inexact; 2120 2121 2121 2122 pol = xfrm_policy_eval_candidates(&cand, ret, fl, type, 2122 - family, dir, if_id); 2123 + family, if_id); 2123 2124 if (pol) { 2124 2125 ret = pol; 2125 2126 if (IS_ERR(pol))