diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965-rs.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c index 287c75705c44..8dc78c0bf1ff 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c | |||
@@ -36,9 +36,6 @@ | |||
36 | 36 | ||
37 | #include <linux/workqueue.h> | 37 | #include <linux/workqueue.h> |
38 | 38 | ||
39 | #include <net/mac80211.h> | ||
40 | #include <linux/wireless.h> | ||
41 | |||
42 | #define IWL 4965 | 39 | #define IWL 4965 |
43 | 40 | ||
44 | #include "../net/mac80211/ieee80211_rate.h" | 41 | #include "../net/mac80211/ieee80211_rate.h" |
@@ -2024,12 +2021,18 @@ static int open_file_generic(struct inode *inode, struct file *file) | |||
2024 | static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv, | 2021 | static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv, |
2025 | struct iwl_rate *mcs, int index) | 2022 | struct iwl_rate *mcs, int index) |
2026 | { | 2023 | { |
2027 | const u32 cck_rate = 0x820A; | 2024 | u32 base_rate; |
2025 | |||
2026 | if (rs_priv->phymode == (u8) MODE_IEEE80211A) | ||
2027 | base_rate = 0x800D; | ||
2028 | else | ||
2029 | base_rate = 0x820A; | ||
2030 | |||
2028 | if (rs_priv->dbg_fixed.rate_n_flags) { | 2031 | if (rs_priv->dbg_fixed.rate_n_flags) { |
2029 | if (index < 12) | 2032 | if (index < 12) |
2030 | mcs->rate_n_flags = rs_priv->dbg_fixed.rate_n_flags; | 2033 | mcs->rate_n_flags = rs_priv->dbg_fixed.rate_n_flags; |
2031 | else | 2034 | else |
2032 | mcs->rate_n_flags = cck_rate; | 2035 | mcs->rate_n_flags = base_rate; |
2033 | IWL_DEBUG_RATE("Fixed rate ON\n"); | 2036 | IWL_DEBUG_RATE("Fixed rate ON\n"); |
2034 | return; | 2037 | return; |
2035 | } | 2038 | } |