diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-05-20 14:37:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-20 14:37:36 -0700 |
| commit | 81d85346b3fcd8b3167eac8b5fb415a210bd4345 (patch) | |
| tree | 5a5827b8f6d2e8b06f31ccb69ce94ce28ac51439 /net/8021q/vlan.c | |
| parent | 0e91796eb46e29edc791131c832a2232bcaed9dd (diff) | |
| download | linux-81d85346b3fcd8b3167eac8b5fb415a210bd4345.tar.gz linux-81d85346b3fcd8b3167eac8b5fb415a210bd4345.tar.bz2 linux-81d85346b3fcd8b3167eac8b5fb415a210bd4345.zip | |
vlan: Correctly handle device notifications for layered VLAN devices
Commit 30688a9 ([VLAN]: Handle vlan devices net namespace changing)
changed the device notifier to special-case notifications for VLAN
devices, effectively disabling state propagation to underlying VLAN
devices. This is needed for layered VLANs though, so restore the
original behaviour.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan.c')
| -rw-r--r-- | net/8021q/vlan.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 2a739adaa92b..b934159a6f07 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -410,10 +410,8 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event, int i, flgs; struct net_device *vlandev; - if (is_vlan_dev(dev)) { + if (is_vlan_dev(dev)) __vlan_device_event(dev, event); - goto out; - } grp = __vlan_find_group(dev); if (!grp) |