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)
committerVarun Wadekar <vwadekar@nvidia.com>
Fri, 18 May 2012 10:38:51 +0000 (15:38 +0530)
commit8d99448effd3bc10f8954037d64cfa61ccb5ce55
treeee520479a858eb1673f650477ec64243b80e3dea
parentf9841814eb1a9f5309e7faee73ce026539c41ec4
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