]> 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)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 10 Jun 2012 13:42:05 +0000 (14:42 +0100)
commit0fc2cf738f345db9798e546a70810c5984aed214
treea9eba318f20a1ad1f12172a7050a9722c83264c5
parenta549123336c6afafcf2fd2eea7248a8c9ac3385f
Revert "net: maintain namespace isolation between vlan and real device"

[ Upstream commit 59b9997baba5242997ddc7bd96b1391f5275a5a4 ]

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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/net/macvlan.c
include/linux/netdevice.h
net/8021q/vlan_dev.c
net/core/dev.c