Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763362AbYFNAUX (ORCPT ); Fri, 13 Jun 2008 20:20:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761598AbYFNAOH (ORCPT ); Fri, 13 Jun 2008 20:14:07 -0400 Received: from mx2.suse.de ([195.135.220.15]:51928 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760746AbYFNAOF (ORCPT ); Fri, 13 Jun 2008 20:14:05 -0400 Date: Fri, 13 Jun 2008 17:11:26 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Patrick McHardy , Pavel Emelyanov , "David S. Miller" , Chris Wright Subject: [patch 24/47] vlan: Correctly handle device notifications for layered VLAN devices Message-ID: <20080614001126.GX24698@suse.de> References: <20080613234753.235721454@mini.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="vlan-correctly-handle-device-notifications-for-layered-vlan-devices.patch" In-Reply-To: <20080614000840.GA24659@suse.de> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1339 Lines: 42 -stable review patch. If anyone has any objections, please let us know. ------------------ From: Patrick McHardy [ 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 Acked-by: Pavel Emelyanov Signed-off-by: David S. Miller Signed-off-by: Chris Wright --- 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) -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/