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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-3945.c
	net/mac80211/mlme.c

diff --cc drivers/net/wireless/iwlwifi/iwl-3945.c
index 38866ab0040faaa15ad71dca119c9371af3cd188,55ac850744b343024189ec0db16efc10e0d9aec9..94e177a9f51ca0d3e39b4dd44b3caf8440e525ef
--- 1/drivers/net/wireless/iwlwifi/iwl-3945.c
--- 2/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@@ -489,8 -487,8 +489,8 @@@ static void iwl3945_dbg_report_frame(st
                 *    but you can hack it to show more, if you'd like to. */
                if (dataframe)
                        IWL_DEBUG_RX("%s: mhd=0x%04x, dst=0x%02x, "
-                                    "len=%u, rssi=%d, chnl=%d, rate=%u, \n",
+                                    "len=%u, rssi=%d, chnl=%d, rate=%d, \n",
 -                                   title, fc, header->addr1[5],
 +                                   title, le16_to_cpu(fc), header->addr1[5],
                                     length, rssi, channel, rate);
                else {
                        /* src/dst addresses assume managed mode */

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

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

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/mac80211/mlme.c
index 37ea04f5bab97badb7e80fc0aa08d18cd2323a8c,b404537c0bcd1a470f4f7e305ab18c1e263c0b34..dbc8cf454bc038af959198b70622a4259ce2618e
--- 1/net/mac80211/mlme.c
--- 2/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -570,10 -552,10 +569,10 @@@ static void ieee80211_set_associated(st
                memcpy(wrqu.ap_addr.sa_data, sdata->u.sta.bssid, ETH_ALEN);
                ieee80211_sta_send_associnfo(dev, ifsta);
        } else {
+               netif_carrier_off(dev);
                ieee80211_sta_tear_down_BA_sessions(dev, ifsta->bssid);
                ifsta->flags &= ~IEEE80211_STA_ASSOCIATED;
-               netif_carrier_off(dev);
 -              ieee80211_reset_erp_info(dev);
 +              changed |= ieee80211_reset_erp_info(dev);
  
                sdata->bss_conf.assoc_ht = 0;
                sdata->bss_conf.ht_conf = NULL;

diff --cc net/sctp/sm_statefuns.c
Simple merge