diff options
| author | Ying Xue <ying.xue@windriver.com> | 2015-05-12 18:29:44 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-12 23:19:49 -0400 |
| commit | 9449c3cd90472141cf081af88181a56163ff7132 (patch) | |
| tree | b6519d7899fbf123f1320393b70c1c85f7926c1f | |
| parent | cffc642d93f9324a06dfbd7da9af29652952a248 (diff) | |
| download | linux-stable-9449c3cd90472141cf081af88181a56163ff7132.tar.gz linux-stable-9449c3cd90472141cf081af88181a56163ff7132.tar.bz2 linux-stable-9449c3cd90472141cf081af88181a56163ff7132.zip | |
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: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/dst.h | 12 | ||||
| -rw-r--r-- | net/xfrm/xfrm_output.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index 22aa93f165f1..2bc73f8a00a9 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -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) { diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index fbcedbe33190..68ada2ca4b60 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c @@ -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); |