Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Thu, 3 Apr 2008 05:35:23 +0000 (22:35 -0700)]
Conflicts:

drivers/net/s2io.c

27 files changed:
1  2 
drivers/net/Kconfig
drivers/net/forcedeth.c
drivers/net/s2io.c
drivers/net/usb/dm9601.c
drivers/net/wan/lapbether.c
drivers/net/wireless/b43/dma.c
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/rt2x00/rt2x00dev.c
include/linux/netdevice.h
net/8021q/vlan.c
net/8021q/vlanproc.c
net/bluetooth/l2cap.c
net/bluetooth/rfcomm/sock.c
net/bluetooth/sco.c
net/ipv4/inet_fragment.c
net/ipv4/ip_forward.c
net/ipv4/udp.c
net/ipv6/addrconf.c
net/ipv6/icmp.c
net/ipv6/ip6_input.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/llc/af_llc.c
net/llc/llc_c_ac.c
net/llc/llc_input.c
net/mac80211/ieee80211.c
net/mac80211/ieee80211_sta.c
net/rose/af_rose.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/udp.c
Simple merge
Simple merge
diff --cc net/ipv6/icmp.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge