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

Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/3c509.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/bnx2x_main.c
Simple merge

diff --cc drivers/net/cris/eth_v10.c
Simple merge

diff --cc drivers/net/fs_enet/fs_enet-main.c
Simple merge

diff --cc drivers/net/irda/ks959-sir.c
Simple merge

diff --cc drivers/net/irda/ksdazzle-sir.c
Simple merge

diff --cc drivers/net/mv643xx_eth.c
Simple merge

diff --cc drivers/net/niu.c
Simple merge

diff --cc drivers/net/smc911x.c
Simple merge

diff --cc drivers/net/smc91x.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/net/wireless/ath5k/base.c
index 7ac5f2847da507899a72717934eb7d67922aaa7a,cfd4d052d666ea8cbda45b37c541cb2592dad3a0..6f368e8cdf17766bf5fee052a6070157dad27c56
--- 1/drivers/net/wireless/ath5k/base.c
--- 2/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@@ -2949,14 -2942,13 +2949,16 @@@ static void ath5k_configure_filter(stru
                sc->opmode != NL80211_IFTYPE_MESH_POINT &&
                test_bit(ATH_STAT_PROMISC, sc->status))
                rfilt |= AR5K_RX_FILTER_PROM;
-       if (sc->opmode == NL80211_IFTYPE_ADHOC)
+       if (sc->opmode == NL80211_IFTYPE_STATION ||
+               sc->opmode == NL80211_IFTYPE_ADHOC) {
                rfilt |= AR5K_RX_FILTER_BEACON;
+       }
 +      if (sc->opmode == NL80211_IFTYPE_MESH_POINT)
 +              rfilt |= AR5K_RX_FILTER_CONTROL | AR5K_RX_FILTER_BEACON |
 +                      AR5K_RX_FILTER_PROBEREQ | AR5K_RX_FILTER_PROM;
  
        /* Set filters */
 -      ath5k_hw_set_rx_filter(ah,rfilt);
 +      ath5k_hw_set_rx_filter(ah, rfilt);
  
        /* Set multicast bits */
        ath5k_hw_set_mcast_filter(ah, mfilt[0], mfilt[1]);

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl3945-base.c
Simple merge

diff --cc drivers/net/wireless/zd1211rw/zd_usb.c
Simple merge

diff --cc fs/cifs/connect.c
Simple merge

diff --cc net/8021q/vlan_core.c
index 118adef476c3a57203434d81f81714645283c121,68ced4bf158c7558977e3c4a44ef4567157e80d5..dd86a1dc4cd00f597ceb58cccefe2625bb1541fa
--- 1/net/8021q/vlan_core.c
--- 2/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@@ -15,18 -24,32 +24,30 @@@ int __vlan_hwaccel_rx(struct sk_buff *s
        }
  
        skb->vlan_tci = vlan_tci;
+       cb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
+ 
+       return (polling ? netif_receive_skb(skb) : netif_rx(skb));
+ }
+ EXPORT_SYMBOL(__vlan_hwaccel_rx);
+ 
+ int vlan_hwaccel_do_receive(struct sk_buff *skb)
+ {
+       struct vlan_hwaccel_cb *cb = vlan_hwaccel_cb(skb);
+       struct net_device *dev = cb->dev;
+       struct net_device_stats *stats;
+ 
        netif_nit_deliver(skb);
  
-       skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
-       if (skb->dev == NULL) {
-               dev_kfree_skb_any(skb);
-               /* Not NET_RX_DROP, this is not being dropped
-                * due to congestion. */
-               return NET_RX_SUCCESS;
+       if (dev == NULL) {
+               kfree_skb(skb);
+               return -1;
        }
+ 
+       skb->dev = dev;
+       skb->priority = vlan_get_ingress_priority(dev, skb->vlan_tci);
        skb->vlan_tci = 0;
  
-       stats = &skb->dev->stats;
 -      dev->last_rx = jiffies;
 -
+       stats = &dev->stats;
        stats->rx_packets++;
        stats->rx_bytes += skb->len;
  

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/udp.c
index 7e4d9c87115321eb53d0864b2d500d0abba0fd30,cf02701ced48091d9eecb6765fe80934a3dc73c8..54badc9a019d03edb0180150b62a560d37f9c30f
--- 1/net/ipv4/udp.c
--- 2/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@@ -1122,16 -1072,15 +1123,16 @@@ drop
  static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb,
                                    struct udphdr  *uh,
                                    __be32 saddr, __be32 daddr,
 -                                  struct hlist_head udptable[])
 +                                  struct udp_table *udptable)
  {
        struct sock *sk;
 +      struct udp_hslot *hslot = &udptable->hash[udp_hashfn(net, ntohs(uh->dest))];
        int dif;
  
 -      read_lock(&udp_hash_lock);
 -      sk = sk_head(&udptable[udp_hashfn(net, ntohs(uh->dest))]);
 +      spin_lock(&hslot->lock);
 +      sk = sk_head(&hslot->head);
        dif = skb->dev->ifindex;
-       sk = udp_v4_mcast_next(sk, uh->dest, daddr, uh->source, saddr, dif);
+       sk = udp_v4_mcast_next(net, sk, uh->dest, daddr, uh->source, saddr, dif);
        if (sk) {
                struct sock *sknext = NULL;
  

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/udp.c
index 32d914db6c4fa90e5d773fc405242ee349e83ce4,8b48512ebf6ac98ce279a7ca69daa6639970f1e3..8dafa36b1ba539bcb7405e82e25e017c2dc248ec
--- 1/net/ipv6/udp.c
--- 2/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@@ -405,13 -392,12 +419,13 @@@ static int __udp6_lib_mcast_deliver(str
  {
        struct sock *sk, *sk2;
        const struct udphdr *uh = udp_hdr(skb);
 +      struct udp_hslot *hslot = &udptable->hash[udp_hashfn(net, ntohs(uh->dest))];
        int dif;
  
 -      read_lock(&udp_hash_lock);
 -      sk = sk_head(&udptable[udp_hashfn(net, ntohs(uh->dest))]);
 +      spin_lock(&hslot->lock);
 +      sk = sk_head(&hslot->head);
        dif = inet6_iif(skb);
-       sk = udp_v6_mcast_next(sk, uh->dest, daddr, uh->source, saddr, dif);
+       sk = udp_v6_mcast_next(net, sk, uh->dest, daddr, uh->source, saddr, dif);
        if (!sk) {
                kfree_skb(skb);
                goto out;

diff --cc net/rfkill/rfkill.c
Simple merge

diff --cc net/socket.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge

diff --cc net/xfrm/xfrm_user.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge