Subject: [VLAN]: Correctly handle device notifications for layered VLAN devices

From: Patrick McHardy <[email-masked]>
Date: Tue, 20 May 2008 15:23:34 +0200

commit cf794e6af782a838252dfc9fc6f10f7a7f66f62a
Author: Patrick McHardy <[email-masked]>
Date:   Tue May 20 15:12:49 2008 +0200

    [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 <[email-masked]>

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