Commit 9449c3cd authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files

net: make skb_dst_pop routine static 



As xfrm_output_one() is the only caller of skb_dst_pop(), we should
make skb_dst_pop() localized.

Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cffc642d

include/net/dst.h

+0 −12
Original line number Diff line number Diff line
@@ -349,18 +349,6 @@ static inline void skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev, 
	__skb_tunnel_rx(skb, dev, net);

}



/* Children define the path of the packet through the

 * Linux networking.  Thus, destinations are stackable.

 */



static inline struct dst_entry *skb_dst_pop(struct sk_buff *skb)

{

	struct dst_entry *child = dst_clone(skb_dst(skb)->child);



	skb_dst_drop(skb);

	return child;

}



int dst_discard_sk(struct sock *sk, struct sk_buff *skb);

static inline int dst_discard(struct sk_buff *skb)

{

net/xfrm/xfrm_output.c

+12 −0
Original line number Diff line number Diff line
@@ -38,6 +38,18 @@ static int xfrm_skb_check_space(struct sk_buff *skb) 
	return pskb_expand_head(skb, nhead, ntail, GFP_ATOMIC);

}



/* Children define the path of the packet through the

 * Linux networking.  Thus, destinations are stackable.

 */



static struct dst_entry *skb_dst_pop(struct sk_buff *skb)

{

	struct dst_entry *child = dst_clone(skb_dst(skb)->child);



	skb_dst_drop(skb);

	return child;

}



static int xfrm_output_one(struct sk_buff *skb, int err)

{

	struct dst_entry *dst = skb_dst(skb);