diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-16 22:17:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-16 22:17:37 -0400 |
| commit | 028940342a906db8da014a7603a0deddc2c323dd (patch) | |
| tree | 688dbc38a3e218f2493d311b1d70a67668837347 /include/linux/netdevice.h | |
| parent | be3eed2e96340d3c7a4d1ea1d63e7bd6095d1e34 (diff) | |
| parent | 0e93b4b304ae052ba1bc73f6d34a68556fe93429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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 7f377fb8b527..b0f6f22723c3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -1426,15 +1426,6 @@ static inline bool netdev_uses_dsa_tags(struct net_device *dev) | |||
| 1426 | return 0; | 1426 | return 0; |
| 1427 | } | 1427 | } |
| 1428 | 1428 | ||
| 1429 | #ifndef CONFIG_NET_NS | ||
| 1430 | static inline void skb_set_dev(struct sk_buff *skb, struct net_device *dev) | ||
| 1431 | { | ||
| 1432 | skb->dev = dev; | ||
| 1433 | } | ||
| 1434 | #else /* CONFIG_NET_NS */ | ||
| 1435 | void skb_set_dev(struct sk_buff *skb, struct net_device *dev); | ||
| 1436 | #endif | ||
| 1437 | |||
| 1438 | static inline bool netdev_uses_trailer_tags(struct net_device *dev) | 1429 | static inline bool netdev_uses_trailer_tags(struct net_device *dev) |
| 1439 | { | 1430 | { |
| 1440 | #ifdef CONFIG_NET_DSA_TAG_TRAILER | 1431 | #ifdef CONFIG_NET_DSA_TAG_TRAILER |