Commit b92cf4aa authored by David Miller's avatar David Miller Committed by David S. Miller
Browse files

net: Create and use new helper xfrm_dst_child(). 



Only IPSEC routes have a non-NULL dst->child pointer.  And IPSEC
routes are identified by a non-NULL dst->xfrm pointer.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 071fb37e

include/net/xfrm.h

+9 −0
Original line number Diff line number Diff line
@@ -994,6 +994,15 @@ struct xfrm_dst { 
	u32 path_cookie;

};



static inline struct dst_entry *xfrm_dst_child(const struct dst_entry *dst)

{

#ifdef CONFIG_XFRM

	if (dst->xfrm)

		return dst->child;

#endif

	return NULL;

}



#ifdef CONFIG_XFRM

static inline void xfrm_dst_destroy(struct xfrm_dst *xdst)

{

net/core/dst.c

+5 −3
Original line number Diff line number Diff line
@@ -116,12 +116,14 @@ EXPORT_SYMBOL(dst_alloc); 


struct dst_entry *dst_destroy(struct dst_entry * dst)

{

	struct dst_entry *child;

	struct dst_entry *child = NULL;



	smp_rmb();



#ifdef CONFIG_XFRM

	if (dst->xfrm)

		child = dst->child;



#endif

	if (!(dst->flags & DST_NOCOUNT))

		dst_entries_add(dst->ops, -1);

net/ipv4/xfrm4_mode_tunnel.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int xfrm4_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) 
	top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ?

		0 : (XFRM_MODE_SKB_CB(skb)->frag_off & htons(IP_DF));



	top_iph->ttl = ip4_dst_hoplimit(dst->child);

	top_iph->ttl = ip4_dst_hoplimit(xfrm_dst_child(dst));



	top_iph->saddr = x->props.saddr.a4;

	top_iph->daddr = x->id.daddr.a4;

net/ipv6/xfrm6_mode_tunnel.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int xfrm6_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) 
	if (x->props.flags & XFRM_STATE_NOECN)

		dsfield &= ~INET_ECN_MASK;

	ipv6_change_dsfield(top_iph, 0, dsfield);

	top_iph->hop_limit = ip6_dst_hoplimit(dst->child);

	top_iph->hop_limit = ip6_dst_hoplimit(xfrm_dst_child(dst));

	top_iph->saddr = *(struct in6_addr *)&x->props.saddr;

	top_iph->daddr = *(struct in6_addr *)&x->id.daddr;

	return 0;

net/ipv6/xfrm6_policy.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, 
			in6_dev_put(xdst->u.rt6.rt6i_idev);

			xdst->u.rt6.rt6i_idev = loopback_idev;

			in6_dev_hold(loopback_idev);

			xdst = (struct xfrm_dst *)xdst->u.dst.child;

			xdst = (struct xfrm_dst *)xfrm_dst_child(&xdst->u.dst);

		} while (xdst->u.dst.xfrm);



		__in6_dev_put(loopback_idev);