[patch 24/47] vlan: Correctly handle device notifications for layered VLAN devices

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Greg KH
Date: Friday, June 13, 2008 - 5:11 pm

-stable review patch.  If anyone has any objections, please let us know.

------------------
From: Patrick McHardy <kaber@trash.net>

[ 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>
---
 net/8021q/vlan.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -397,10 +397,8 @@ static int vlan_device_event(struct noti
 	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)

-- 
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[patch 00/47] 2.6.25-stable review, Greg KH, (Fri Jun 13, 5:08 pm)
[patch 01/47] b43: Fix controller restart crash, Greg KH, (Fri Jun 13, 5:10 pm)
[patch 02/47] ipwireless: Fix blocked sending, Greg KH, (Fri Jun 13, 5:10 pm)
[patch 10/47] ecryptfs: clean up (un)lock_parent, Greg KH, (Fri Jun 13, 5:10 pm)
[patch 11/47] ecryptfs: fix missed mutex_unlock, Greg KH, (Fri Jun 13, 5:10 pm)
[patch 24/47] vlan: Correctly handle device notifications ..., Greg KH, (Fri Jun 13, 5:11 pm)
[patch 35/47] cciss: add new hardware support, Greg KH, (Fri Jun 13, 5:11 pm)
[patch 36/47] hgafb: resource management fix, Greg KH, (Fri Jun 13, 5:11 pm)
[patch 37/47] forcedeth: msi interrupts, Greg KH, (Fri Jun 13, 5:11 pm)
[patch 42/47] CPUFREQ: Fix format string bug., Greg KH, (Fri Jun 13, 5:12 pm)
[patch 46/47] x86: fix recursive dependencies, Greg KH, (Fri Jun 13, 5:12 pm)