From: David S. Miller <davem@davemloft.net>
Date: Thu, 3 Apr 2008 05:35:23 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.26-rc1~1138^2~229
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/s2io.c
---

e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a
diff --cc net/8021q/vlan.c
index 694be86e449,b33410abfd6..5975ec3be7f
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@@ -392,9 -394,15 +404,15 @@@ static int vlan_device_event(struct not
  	int i, flgs;
  	struct net_device *vlandev;
  
 -	if (dev->nd_net != &init_net)
 +	if (dev_net(dev) != &init_net)
  		return NOTIFY_DONE;
  
+ 	if (is_vlan_dev(dev)) {
+ 		__vlan_device_event(dev, event);
+ 		goto out;
+ 	}
+ 
+ 	grp = __vlan_find_group(dev->ifindex);
  	if (!grp)
  		goto out;