diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-03-08 09:37:53 +0100 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-23 14:20:13 -0700 |
| commit | 9543c5f3d6f8a1eaf770ab097d3f1c13f96ca544 (patch) | |
| tree | cede8573315f626de2380c48a43955f2cee6d56f /drivers/net/wireless/iwlwifi/iwl-agn-rs.h | |
| parent | 647ad135e3cbad19a7a963922750a4a5cd2e9e8f (diff) | |
| download | linux-9543c5f3d6f8a1eaf770ab097d3f1c13f96ca544.tar.gz linux-9543c5f3d6f8a1eaf770ab097d3f1c13f96ca544.tar.bz2 linux-9543c5f3d6f8a1eaf770ab097d3f1c13f96ca544.zip | |
iwlwifi: properly set basic rates
This fixes a long-standing bug: iwlwifi always assumes
that the CCK ACK rates are 1 and 2 MBps and the OFDM
ACK rates are 6, 12 and 24 MBps. Fix this problem by
using the basic rates the AP (or in AP case hostapd)
told us to use and add the necessary mandatory rates
to the mix.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rs.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h index 203b1c13c491..351717a77ad9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h @@ -174,32 +174,6 @@ enum { IWL_RATE_11M_IEEE = 22, }; -#define IWL_CCK_BASIC_RATES_MASK \ - (IWL_RATE_1M_MASK | \ - IWL_RATE_2M_MASK) - -#define IWL_CCK_RATES_MASK \ - (IWL_CCK_BASIC_RATES_MASK | \ - IWL_RATE_5M_MASK | \ - IWL_RATE_11M_MASK) - -#define IWL_OFDM_BASIC_RATES_MASK \ - (IWL_RATE_6M_MASK | \ - IWL_RATE_12M_MASK | \ - IWL_RATE_24M_MASK) - -#define IWL_OFDM_RATES_MASK \ - (IWL_OFDM_BASIC_RATES_MASK | \ - IWL_RATE_9M_MASK | \ - IWL_RATE_18M_MASK | \ - IWL_RATE_36M_MASK | \ - IWL_RATE_48M_MASK | \ - IWL_RATE_54M_MASK) - -#define IWL_BASIC_RATES_MASK \ - (IWL_OFDM_BASIC_RATES_MASK | \ - IWL_CCK_BASIC_RATES_MASK) - #define IWL_RATES_MASK ((1 << IWL_RATE_COUNT) - 1) #define IWL_INVALID_VALUE -1 |