diff options
author | Florian Westphal <fw@strlen.de> | 2019-04-16 10:44:38 -0400 |
---|---|---|
committer | Steffen Klassert <steffen.klassert@secunet.com> | 2019-04-23 01:42:20 -0400 |
commit | 2e8b4aa816eaaf480fe68b1086614259caf1bf3c (patch) | |
tree | 2added5a80a6525ee78f7c631839b15fdebf55af /net/ipv6 | |
parent | f24ea52873c726bf7b54318f00ec45050222b367 (diff) |
xfrm: remove init_path indirection from afinfo_policy
handle this directly, its only used by ipv6.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/xfrm6_policy.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 0e92fa2f9678..358e834fedce 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
@@ -71,19 +71,6 @@ static int xfrm6_get_saddr(struct net *net, int oif, | |||
71 | return 0; | 71 | return 0; |
72 | } | 72 | } |
73 | 73 | ||
74 | static int xfrm6_init_path(struct xfrm_dst *path, struct dst_entry *dst, | ||
75 | int nfheader_len) | ||
76 | { | ||
77 | if (dst->ops->family == AF_INET6) { | ||
78 | struct rt6_info *rt = (struct rt6_info *)dst; | ||
79 | path->path_cookie = rt6_get_cookie(rt); | ||
80 | } | ||
81 | |||
82 | path->u.rt6.rt6i_nfheader_len = nfheader_len; | ||
83 | |||
84 | return 0; | ||
85 | } | ||
86 | |||
87 | static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, | 74 | static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, |
88 | const struct flowi *fl) | 75 | const struct flowi *fl) |
89 | { | 76 | { |
@@ -287,7 +274,6 @@ static const struct xfrm_policy_afinfo xfrm6_policy_afinfo = { | |||
287 | .dst_lookup = xfrm6_dst_lookup, | 274 | .dst_lookup = xfrm6_dst_lookup, |
288 | .get_saddr = xfrm6_get_saddr, | 275 | .get_saddr = xfrm6_get_saddr, |
289 | .decode_session = _decode_session6, | 276 | .decode_session = _decode_session6, |
290 | .init_path = xfrm6_init_path, | ||
291 | .fill_dst = xfrm6_fill_dst, | 277 | .fill_dst = xfrm6_fill_dst, |
292 | .blackhole_route = ip6_blackhole_route, | 278 | .blackhole_route = ip6_blackhole_route, |
293 | }; | 279 | }; |