diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-25 20:38:16 +0200 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-25 20:38:16 +0200 |
| commit | 9c78965ca18594fe0a34a1a1b13781b10f85e4bc (patch) | |
| tree | 60c9e83d3c2b56e3c7f5169b63577a72bf7ddb57 /include/net/dst.h | |
| parent | Revert adding some arch-specific signal syscalls to <linux/syscalls.h>. (diff) | |
| parent | Linux 2.6.35-rc3 (diff) | |
| download | linux-9c78965ca18594fe0a34a1a1b13781b10f85e4bc.tar.xz linux-9c78965ca18594fe0a34a1a1b13781b10f85e4bc.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'include/net/dst.h')
| -rw-r--r-- | include/net/dst.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index 612069beda73..81d1413a8701 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -250,11 +250,11 @@ static inline void skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev) * Linux networking. Thus, destinations are stackable. */ -static inline struct dst_entry *dst_pop(struct dst_entry *dst) +static inline struct dst_entry *skb_dst_pop(struct sk_buff *skb) { - struct dst_entry *child = dst_clone(dst->child); + struct dst_entry *child = skb_dst(skb)->child; - dst_release(dst); + skb_dst_drop(skb); return child; } |