diff options
| author | Colin Cross <ccross@android.com> | 2012-05-14 16:41:02 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-05-14 16:41:02 -0700 |
| commit | ec0b571c19ac62ab0bb80d373a3d4922a48b4b75 (patch) | |
| tree | 10c597f5227c969c3f2b909fbeb29725a0c5c6e8 /include/linux/netdevice.h | |
| parent | 7bb8b65407a519d3a90dd8cecdd1ccd10ee0c6cc (diff) | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
Merge commit 'v3.4-rc7' into android-3.4
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 5cbaa20f165..33900a53c99 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1403,15 +1403,6 @@ static inline bool netdev_uses_dsa_tags(struct net_device *dev) return 0; } -#ifndef CONFIG_NET_NS -static inline void skb_set_dev(struct sk_buff *skb, struct net_device *dev) -{ - skb->dev = dev; -} -#else /* CONFIG_NET_NS */ -void skb_set_dev(struct sk_buff *skb, struct net_device *dev); -#endif - static inline bool netdev_uses_trailer_tags(struct net_device *dev) { #ifdef CONFIG_NET_DSA_TAG_TRAILER |