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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
  [TG3]: Fix msi issue with kexec/kdump.
  [NET] XFRM: Fix whitespace errors.
  [NET] TIPC: Fix whitespace errors.
  [NET] SUNRPC: Fix whitespace errors.
  [NET] SCTP: Fix whitespace errors.
  [NET] RXRPC: Fix whitespace errors.
  [NET] ROSE: Fix whitespace errors.
  [NET] RFKILL: Fix whitespace errors.
  [NET] PACKET: Fix whitespace errors.
  [NET] NETROM: Fix whitespace errors.
  [NET] NETFILTER: Fix whitespace errors.
  [NET] IPV4: Fix whitespace errors.
  [NET] DCCP: Fix whitespace errors.
  [NET] CORE: Fix whitespace errors.
  [NET] BLUETOOTH: Fix whitespace errors.
  [NET] AX25: Fix whitespace errors.
  [PATCH] mac80211: remove rtnl locking in ieee80211_sta.c
  [PATCH] mac80211: fix GCC warning on 64bit platforms
  [GENETLINK]: Dynamic multicast groups.
  [NETLIKN]: Allow removing multicast groups.
  ...

diff --combined net/core/sock.c
index 25d2557211c17efafab2396e094b2ef62dc3fdbb,1d55fbd22dfa4c8c0011ae3d783e9d32849c0b1e..239a08a6ff2457fd134eb22472910af7a3026427
--- 1/net/core/sock.c
--- 2/net/core/sock.c
+++ b/net/core/sock.c
@@@ -171,19 -171,6 +171,19 @@@ static const char *af_family_slock_key_
    "slock-AF_TIPC"  , "slock-AF_BLUETOOTH", "slock-AF_IUCV"     ,
    "slock-AF_RXRPC" , "slock-AF_MAX"
  };
 +static const char *af_family_clock_key_strings[AF_MAX+1] = {
 +  "clock-AF_UNSPEC", "clock-AF_UNIX"     , "clock-AF_INET"     ,
 +  "clock-AF_AX25"  , "clock-AF_IPX"      , "clock-AF_APPLETALK",
 +  "clock-AF_NETROM", "clock-AF_BRIDGE"   , "clock-AF_ATMPVC"   ,
 +  "clock-AF_X25"   , "clock-AF_INET6"    , "clock-AF_ROSE"     ,
 +  "clock-AF_DECnet", "clock-AF_NETBEUI"  , "clock-AF_SECURITY" ,
 +  "clock-AF_KEY"   , "clock-AF_NETLINK"  , "clock-AF_PACKET"   ,
 +  "clock-AF_ASH"   , "clock-AF_ECONET"   , "clock-AF_ATMSVC"   ,
 +  "clock-21"       , "clock-AF_SNA"      , "clock-AF_IRDA"     ,
 +  "clock-AF_PPPOX" , "clock-AF_WANPIPE"  , "clock-AF_LLC"      ,
 +  "clock-27"       , "clock-28"          , "clock-29"          ,
 +  "clock-AF_TIPC"  , "clock-AF_BLUETOOTH", "clock-AF_MAX"
 +};
  #endif
  
  /*
@@@ -230,7 -217,7 +230,7 @@@ static int sock_set_timeout(long *timeo
                        warned++;
                        printk(KERN_INFO "sock_set_timeout: `%s' (pid %d) "
                               "tries to set negative timeout\n",
-                               current->comm, current->pid);
+                               current->comm, current->pid);
                return 0;
        }
        *timeo_p = MAX_SCHEDULE_TIMEOUT;
@@@ -954,9 -941,8 +954,9 @@@ struct sock *sk_clone(const struct soc
  
                rwlock_init(&newsk->sk_dst_lock);
                rwlock_init(&newsk->sk_callback_lock);
 -              lockdep_set_class(&newsk->sk_callback_lock,
 -                                 af_callback_keys + newsk->sk_family);
 +              lockdep_set_class_and_name(&newsk->sk_callback_lock,
 +                              af_callback_keys + newsk->sk_family,
 +                              af_family_clock_key_strings[newsk->sk_family]);
  
                newsk->sk_dst_cache     = NULL;
                newsk->sk_wmem_queued   = 0;
@@@ -1544,9 -1530,8 +1544,9 @@@ void sock_init_data(struct socket *sock
  
        rwlock_init(&sk->sk_dst_lock);
        rwlock_init(&sk->sk_callback_lock);
 -      lockdep_set_class(&sk->sk_callback_lock,
 -                         af_callback_keys + sk->sk_family);
 +      lockdep_set_class_and_name(&sk->sk_callback_lock,
 +                      af_callback_keys + sk->sk_family,
 +                      af_family_clock_key_strings[sk->sk_family]);
  
        sk->sk_state_change     =       sock_def_wakeup;
        sk->sk_data_ready       =       sock_def_readable;

diff --combined net/mac80211/ieee80211_sta.c
index 22b11786327a1063ab96dd961263248f3c364780,952d8dd0676cad9ab0c2ee9651aa2191b233d766..7ba352e3ffe0d451ad2bca62852e84a5b79b5d2e
--- 1/net/mac80211/ieee80211_sta.c
--- 2/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@@ -25,7 -25,6 +25,6 @@@
  #include <linux/wireless.h>
  #include <linux/random.h>
  #include <linux/etherdevice.h>
- #include <linux/rtnetlink.h>
  #include <net/iw_handler.h>
  #include <asm/types.h>
  
@@@ -1327,9 -1326,10 +1326,9 @@@ ieee80211_rx_bss_add(struct net_device 
        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
        struct ieee80211_sta_bss *bss;
  
 -      bss = kmalloc(sizeof(*bss), GFP_ATOMIC);
 +      bss = kzalloc(sizeof(*bss), GFP_ATOMIC);
        if (!bss)
                return NULL;
 -      memset(bss, 0, sizeof(*bss));
        atomic_inc(&bss->users);
        atomic_inc(&bss->users);
        memcpy(bss->bssid, bssid, ETH_ALEN);
@@@ -2106,12 -2106,9 +2105,9 @@@ static int ieee80211_sta_config_auth(st
        struct ieee80211_sta_bss *bss, *selected = NULL;
        int top_rssi = 0, freq;
  
-       rtnl_lock();
- 
        if (!ifsta->auto_channel_sel && !ifsta->auto_bssid_sel &&
            !ifsta->auto_ssid_sel) {
                ifsta->state = IEEE80211_AUTHENTICATE;
-               rtnl_unlock();
                ieee80211_sta_reset_auth(dev, ifsta);
                return 0;
        }
@@@ -2154,7 -2151,6 +2150,6 @@@
                ieee80211_sta_set_bssid(dev, selected->bssid);
                ieee80211_rx_bss_put(dev, selected);
                ifsta->state = IEEE80211_AUTHENTICATE;
-               rtnl_unlock();
                ieee80211_sta_reset_auth(dev, ifsta);
                return 0;
        } else {
@@@ -2165,7 -2161,6 +2160,6 @@@
                } else
                        ifsta->state = IEEE80211_DISABLED;
        }
-       rtnl_unlock();
        return -1;
  }
  

diff --combined net/netfilter/nf_conntrack_standalone.c
index fc847cc63be64b0efc8bdf2e6cc6407f7d5ed8a2,f752293940f98a9afe1a9d24eab3e48bf36e9ba3..a4ce5e8879974c14e36f969b4d9c787d2ba41362
--- 1/net/netfilter/nf_conntrack_standalone.c
--- 2/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@@ -181,7 -181,7 +181,7 @@@ static int ct_seq_show(struct seq_file 
  
        if (seq_printf(s, "use=%u\n", atomic_read(&conntrack->ct_general.use)))
                return -ENOSPC;
-       
+ 
        return 0;
  }
  
@@@ -198,7 -198,7 +198,7 @@@ static int ct_open(struct inode *inode
        struct ct_iter_state *st;
        int ret;
  
 -      st = kmalloc(sizeof(struct ct_iter_state), GFP_KERNEL);
 +      st = kzalloc(sizeof(struct ct_iter_state), GFP_KERNEL);
        if (st == NULL)
                return -ENOMEM;
        ret = seq_open(file, &ct_seq_ops);
@@@ -206,6 -206,7 +206,6 @@@
                goto out_free;
        seq          = file->private_data;
        seq->private = st;
 -      memset(st, 0, sizeof(struct ct_iter_state));
        return ret;
  out_free:
        kfree(st);