From: Patrick McHardy <kaber@trash.net>
Date: Tue, 20 May 2008 21:37:36 +0000 (-0700)
Subject: vlan: Correctly handle device notifications for layered VLAN devices
X-Git-Tag: v2.6.26-rc4~91^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=81d85346b3fcd8b3167eac8b5fb415a210bd4345;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 2a739adaa92..b934159a6f0 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)