diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-11 03:03:34 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-11 03:03:34 (GMT) |
| commit | 59b9997baba5242997ddc7bd96b1391f5275a5a4 (patch) | |
| tree | eaef6c0eff50403fcf871cdd4b7c4afa605f0541 /include/linux/netdevice.h | |
| parent | 380ec964bc19f865af70c0339dff1cb75dc4f8f2 (diff) | |
| download | linux-fsl-qoriq-59b9997baba5242997ddc7bd96b1391f5275a5a4.tar.xz | |
Revert "net: maintain namespace isolation between vlan and real device"
This reverts commit 8a83a00b0735190384a348156837918271034144.
It causes regressions for S390 devices, because it does an
unconditional DST drop on SKBs for vlans and the QETH device
needs the neighbour entry hung off the DST for certain things
on transmit.
Arnd can't remember exactly why he even needed this change.
Conflicts:
drivers/net/macvlan.c
net/8021q/vlan_dev.c
net/core/dev.c
Signed-off-by: David S. Miller <davem@davemloft.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 5cbaa20..33900a5 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 |