Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

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

diff --cc drivers/net/wireless/iwlwifi/iwl-5000.c
index c3f8ec0,de45f30..c6120f0
--- 1/drivers/net/wireless/iwlwifi/iwl-5000.c
--- 2/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@@ -1600,7 -1598,9 +1600,8 @@@ struct iwl_cfg iwl5300_agn_cfg = 
        .use_bsm = false,
        .ht_greenfield_support = true,
        .led_compensation = 51,
+       .use_rts_for_ht = true, /* use rts/cts protection */
        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
 -      .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
  };
  
  struct iwl_cfg iwl5100_bgn_cfg = {
@@@ -1668,7 -1669,9 +1670,8 @@@ struct iwl_cfg iwl5100_agn_cfg = 
        .use_bsm = false,
        .ht_greenfield_support = true,
        .led_compensation = 51,
+       .use_rts_for_ht = true, /* use rts/cts protection */
        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
 -      .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
  };
  
  struct iwl_cfg iwl5350_agn_cfg = {
@@@ -1691,7 -1694,9 +1694,8 @@@
        .use_bsm = false,
        .ht_greenfield_support = true,
        .led_compensation = 51,
+       .use_rts_for_ht = true, /* use rts/cts protection */
        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
 -      .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
  };
  
  struct iwl_cfg iwl5150_agn_cfg = {
@@@ -1714,7 -1719,9 +1718,8 @@@
        .use_bsm = false,
        .ht_greenfield_support = true,
        .led_compensation = 51,
+       .use_rts_for_ht = true, /* use rts/cts protection */
        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
 -      .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
  };
  
  struct iwl_cfg iwl5150_abg_cfg = {

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

diff --cc drivers/net/wireless/iwlwifi/iwl-dev.h
Simple merge

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

diff --cc drivers/net/wireless/iwlwifi/iwl-devtrace.h
Simple merge

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

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

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

diff --cc net/mac80211/mlme.c
index a82564e,05a18f4..1e1d16c
--- 1/net/mac80211/mlme.c
--- 2/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -1478,10 -1963,12 +1478,12 @@@ static void ieee80211_sta_rx_queued_mgm
                        rma = ieee80211_rx_mgmt_disassoc(sdata, mgmt, skb->len);
                        break;
                case IEEE80211_STYPE_ACTION:
-                       /* XXX: differentiate, can only happen for CSA now! */
+                       if (mgmt->u.action.category != WLAN_CATEGORY_SPECTRUM_MGMT)
+                               break;
+ 
                        ieee80211_sta_process_chanswitch(sdata,
                                        &mgmt->u.action.u.chan_switch.sw_elem,
 -                                      ifmgd->associated);
 +                                      (void *)ifmgd->associated->priv);
                        break;
                }
                mutex_unlock(&ifmgd->mtx);

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

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

diff --cc net/wireless/sme.c
Simple merge