diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-10 23:03:34 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-06-10 14:42:05 +0100 |
| commit | 0fc2cf738f345db9798e546a70810c5984aed214 (patch) | |
| tree | a9eba318f20a1ad1f12172a7050a9722c83264c5 /drivers | |
| parent | a549123336c6afafcf2fd2eea7248a8c9ac3385f (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/macvlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 959d4480a651..97f342e64d67 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -258,7 +258,7 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev) xmit_world: skb->ip_summed = ip_summed; - skb_set_dev(skb, vlan->lowerdev); + skb->dev = vlan->lowerdev; return dev_queue_xmit(skb); } |