diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-07-13 14:13:46 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-07-21 10:30:36 -0400 |
commit | c10e2c102ff180998bf91404c2d76ca66ced46a0 (patch) | |
tree | 74b6ad47ddc4429ad99e4c1c197cdc017632713c /drivers | |
parent | b09b296dddde0998e2019d2f355212642056253f (diff) |
iwlagn: testmode fixed rate available for testmode only
Move tm_fixed_rate inside CONFIG_IWLWIFI_DEVICE_SVTOOL and only
available when the option is enable.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index ebcd13bc10d..3789ff4bf53 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |||
@@ -354,9 +354,11 @@ static void rs_program_fix_rate(struct iwl_priv *priv, | |||
354 | lq_sta->active_mimo2_rate = 0x1FD0; /* 6 - 60 MBits, no 9, no CCK */ | 354 | lq_sta->active_mimo2_rate = 0x1FD0; /* 6 - 60 MBits, no 9, no CCK */ |
355 | lq_sta->active_mimo3_rate = 0x1FD0; /* 6 - 60 MBits, no 9, no CCK */ | 355 | lq_sta->active_mimo3_rate = 0x1FD0; /* 6 - 60 MBits, no 9, no CCK */ |
356 | 356 | ||
357 | #ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL | ||
357 | /* testmode has higher priority to overwirte the fixed rate */ | 358 | /* testmode has higher priority to overwirte the fixed rate */ |
358 | if (priv->tm_fixed_rate) | 359 | if (priv->tm_fixed_rate) |
359 | lq_sta->dbg_fixed_rate = priv->tm_fixed_rate; | 360 | lq_sta->dbg_fixed_rate = priv->tm_fixed_rate; |
361 | #endif | ||
360 | 362 | ||
361 | IWL_DEBUG_RATE(priv, "sta_id %d rate 0x%X\n", | 363 | IWL_DEBUG_RATE(priv, "sta_id %d rate 0x%X\n", |
362 | lq_sta->lq.sta_id, lq_sta->dbg_fixed_rate); | 364 | lq_sta->lq.sta_id, lq_sta->dbg_fixed_rate); |
@@ -1080,7 +1082,8 @@ done: | |||
1080 | /* See if there's a better rate or modulation mode to try. */ | 1082 | /* See if there's a better rate or modulation mode to try. */ |
1081 | if (sta && sta->supp_rates[sband->band]) | 1083 | if (sta && sta->supp_rates[sband->band]) |
1082 | rs_rate_scale_perform(priv, skb, sta, lq_sta); | 1084 | rs_rate_scale_perform(priv, skb, sta, lq_sta); |
1083 | #ifdef CONFIG_MAC80211_DEBUGFS | 1085 | |
1086 | #if defined(CONFIG_MAC80211_DEBUGFS) && defined(CONFIG_IWLWIFI_DEVICE_SVTOOL) | ||
1084 | if ((priv->tm_fixed_rate) && | 1087 | if ((priv->tm_fixed_rate) && |
1085 | (priv->tm_fixed_rate != lq_sta->dbg_fixed_rate)) | 1088 | (priv->tm_fixed_rate != lq_sta->dbg_fixed_rate)) |
1086 | rs_program_fix_rate(priv, lq_sta); | 1089 | rs_program_fix_rate(priv, lq_sta); |
@@ -2904,8 +2907,9 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i | |||
2904 | if (sband->band == IEEE80211_BAND_5GHZ) | 2907 | if (sband->band == IEEE80211_BAND_5GHZ) |
2905 | lq_sta->last_txrate_idx += IWL_FIRST_OFDM_RATE; | 2908 | lq_sta->last_txrate_idx += IWL_FIRST_OFDM_RATE; |
2906 | lq_sta->is_agg = 0; | 2909 | lq_sta->is_agg = 0; |
2907 | 2910 | #ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL | |
2908 | priv->tm_fixed_rate = 0; | 2911 | priv->tm_fixed_rate = 0; |
2912 | #endif | ||
2909 | #ifdef CONFIG_MAC80211_DEBUGFS | 2913 | #ifdef CONFIG_MAC80211_DEBUGFS |
2910 | lq_sta->dbg_fixed_rate = 0; | 2914 | lq_sta->dbg_fixed_rate = 0; |
2911 | #endif | 2915 | #endif |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c index a5295c15d70..53bb59ee719 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c | |||
@@ -217,6 +217,7 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv, | |||
217 | if (ieee80211_is_data(fc)) { | 217 | if (ieee80211_is_data(fc)) { |
218 | tx_cmd->initial_rate_index = 0; | 218 | tx_cmd->initial_rate_index = 0; |
219 | tx_cmd->tx_flags |= TX_CMD_FLG_STA_RATE_MSK; | 219 | tx_cmd->tx_flags |= TX_CMD_FLG_STA_RATE_MSK; |
220 | #ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL | ||
220 | if (priv->tm_fixed_rate) { | 221 | if (priv->tm_fixed_rate) { |
221 | /* | 222 | /* |
222 | * rate overwrite by testmode | 223 | * rate overwrite by testmode |
@@ -227,6 +228,7 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv, | |||
227 | memcpy(&tx_cmd->rate_n_flags, &priv->tm_fixed_rate, | 228 | memcpy(&tx_cmd->rate_n_flags, &priv->tm_fixed_rate, |
228 | sizeof(tx_cmd->rate_n_flags)); | 229 | sizeof(tx_cmd->rate_n_flags)); |
229 | } | 230 | } |
231 | #endif | ||
230 | return; | 232 | return; |
231 | } | 233 | } |
232 | 234 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 964be5795c5..72ef50e319d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -1535,8 +1535,8 @@ struct iwl_priv { | |||
1535 | bool led_registered; | 1535 | bool led_registered; |
1536 | #ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL | 1536 | #ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL |
1537 | struct iwl_testmode_trace testmode_trace; | 1537 | struct iwl_testmode_trace testmode_trace; |
1538 | #endif | ||
1539 | u32 tm_fixed_rate; | 1538 | u32 tm_fixed_rate; |
1539 | #endif | ||
1540 | 1540 | ||
1541 | }; /*iwl_priv */ | 1541 | }; /*iwl_priv */ |
1542 | 1542 | ||