]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Revert "net: maintain namespace isolation between vlan and real device"
authorDavid S. Miller <davem@davemloft.net>
Fri, 11 May 2012 03:03:34 +0000 (23:03 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 11 May 2012 03:03:34 +0000 (23:03 -0400)
commit59b9997baba5242997ddc7bd96b1391f5275a5a4
treeeaef6c0eff50403fcf871cdd4b7c4afa605f0541
parent380ec964bc19f865af70c0339dff1cb75dc4f8f2
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>
drivers/net/macvlan.c
include/linux/netdevice.h
net/8021q/vlan_dev.c
net/core/dev.c