Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
John W. Linville [Tue, 19 Jan 2010 20:58:41 +0000 (15:58 -0500)]
13 files changed:
1  2 
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-devtrace.c
drivers/net/wireless/iwlwifi/iwl-devtrace.h
drivers/net/wireless/zd1211rw/zd_usb.c
net/mac80211/cfg.c
net/mac80211/iface.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/wireless/core.c
net/wireless/sme.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 = {
        .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 = {
        .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 = {
Simple merge
Simple merge
@@@ -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);
Simple merge
Simple merge
Simple merge