diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-06-09 11:42:44 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-06-16 13:19:56 -0700 |
| commit | ac1f91cebd455f1651b46fd933805536233a1a98 (patch) | |
| tree | 1bd40b2ab0d3130c79d021eba1d539a083c44216 | |
| parent | 85339198d7abe9edf5204381e0d756c773a739e8 (diff) | |
vlan: Correctly handle device notifications for layered VLAN devices
[ upstream commit: 81d85346b3fcd8b3167eac8b5fb415a210bd4345 ]
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>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
| -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 b33410abfd6b..c0bac6d92074 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -397,10 +397,8 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event, if (dev->nd_net != &init_net) return NOTIFY_DONE; - if (is_vlan_dev(dev)) { + if (is_vlan_dev(dev)) __vlan_device_event(dev, event); - goto out; - } grp = __vlan_find_group(dev->ifindex); if (!grp) |