]> git.baikalelectronics.ru Git - kernel.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)
commite1c0ebbb1bd113c14eaf5a9621ea77dc8d378a5b
treeeaef6c0eff50403fcf871cdd4b7c4afa605f0541
parenta3bfd2b084f50cb0521277597068ccb1d0fe2519
Revert "net: maintain namespace isolation between vlan and real device"

This reverts commit be5d73addae14db55f25596e61b044d30f097425.

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