Commit 2e8b4aa8 authored by Florian Westphal's avatar Florian Westphal Committed by Steffen Klassert
Browse files

xfrm: remove init_path indirection from afinfo_policy 



handle this directly, its only used by ipv6.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent f24ea528

include/net/xfrm.h

+0 −3
Original line number Diff line number Diff line
@@ -329,9 +329,6 @@ struct xfrm_policy_afinfo { 
	void			(*decode_session)(struct sk_buff *skb,

						  struct flowi *fl,

						  int reverse);

	int			(*init_path)(struct xfrm_dst *path,

					     struct dst_entry *dst,

					     int nfheader_len);

	int			(*fill_dst)(struct xfrm_dst *xdst,

					    struct net_device *dev,

					    const struct flowi *fl);

net/ipv4/xfrm4_policy.c

+0 −7
Original line number Diff line number Diff line
@@ -69,12 +69,6 @@ static int xfrm4_get_saddr(struct net *net, int oif, 
	return 0;

}



static int xfrm4_init_path(struct xfrm_dst *path, struct dst_entry *dst,

			   int nfheader_len)

{

	return 0;

}



static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,

			  const struct flowi *fl)

{
@@ -267,7 +261,6 @@ static const struct xfrm_policy_afinfo xfrm4_policy_afinfo = { 
	.dst_lookup =		xfrm4_dst_lookup,

	.get_saddr =		xfrm4_get_saddr,

	.decode_session =	_decode_session4,

	.init_path =		xfrm4_init_path,

	.fill_dst =		xfrm4_fill_dst,

	.blackhole_route =	ipv4_blackhole_route,

};

net/ipv6/xfrm6_policy.c

+0 −14
Original line number Diff line number Diff line
@@ -71,19 +71,6 @@ static int xfrm6_get_saddr(struct net *net, int oif, 
	return 0;

}



static int xfrm6_init_path(struct xfrm_dst *path, struct dst_entry *dst,

			   int nfheader_len)

{

	if (dst->ops->family == AF_INET6) {

		struct rt6_info *rt = (struct rt6_info *)dst;

		path->path_cookie = rt6_get_cookie(rt);

	}



	path->u.rt6.rt6i_nfheader_len = nfheader_len;



	return 0;

}



static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,

			  const struct flowi *fl)

{
@@ -287,7 +274,6 @@ static const struct xfrm_policy_afinfo xfrm6_policy_afinfo = { 
	.dst_lookup =		xfrm6_dst_lookup,

	.get_saddr =		xfrm6_get_saddr,

	.decode_session =	_decode_session6,

	.init_path =		xfrm6_init_path,

	.fill_dst =		xfrm6_fill_dst,

	.blackhole_route =	ip6_blackhole_route,

};

net/xfrm/xfrm_policy.c

+7 −14
Original line number Diff line number Diff line
@@ -2491,21 +2491,14 @@ static inline struct xfrm_dst *xfrm_alloc_dst(struct net *net, int family) 
	return xdst;

}



static inline int xfrm_init_path(struct xfrm_dst *path, struct dst_entry *dst,

static void xfrm_init_path(struct xfrm_dst *path, struct dst_entry *dst,

			   int nfheader_len)

{

	const struct xfrm_policy_afinfo *afinfo =

		xfrm_policy_get_afinfo(dst->ops->family);

	int err;



	if (!afinfo)

		return -EINVAL;



	err = afinfo->init_path(path, dst, nfheader_len);



	rcu_read_unlock();



	return err;

	if (dst->ops->family == AF_INET6) {

		struct rt6_info *rt = (struct rt6_info *)dst;

		path->path_cookie = rt6_get_cookie(rt);

		path->u.rt6.rt6i_nfheader_len = nfheader_len;

	}

}



static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,