diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-01-21 14:33:19 -0500 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-09 19:04:54 -0500 |
commit | 4a02886bae3f2362d4e6efc6fb25dd3507bde8b9 (patch) | |
tree | cb4f83f363474bc73e58e518d79f774239c53874 /drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |
parent | 470ab2dd6a7b0719e59830e11d7bc2e710867b94 (diff) |
iwlwifi: remove priv->active_rate_basic
This variable is assigned a default value,
but then assigned zero as soon as mac80211
calls a change channel (which will happen
right after the hw is started) and after
that it never changes again.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rs.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index 696e668b801d..84271cc62afa 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |||
@@ -597,10 +597,6 @@ static u16 rs_get_supported_rates(struct iwl_lq_sta *lq_sta, | |||
597 | struct ieee80211_hdr *hdr, | 597 | struct ieee80211_hdr *hdr, |
598 | enum iwl_table_type rate_type) | 598 | enum iwl_table_type rate_type) |
599 | { | 599 | { |
600 | if (hdr && is_multicast_ether_addr(hdr->addr1) && | ||
601 | lq_sta->active_rate_basic) | ||
602 | return lq_sta->active_rate_basic; | ||
603 | |||
604 | if (is_legacy(rate_type)) { | 600 | if (is_legacy(rate_type)) { |
605 | return lq_sta->active_legacy_rate; | 601 | return lq_sta->active_legacy_rate; |
606 | } else { | 602 | } else { |
@@ -2552,7 +2548,6 @@ static void rs_rate_init(void *priv_r, struct ieee80211_supported_band *sband, | |||
2552 | lq_sta->missed_rate_counter = IWL_MISSED_RATE_MAX; | 2548 | lq_sta->missed_rate_counter = IWL_MISSED_RATE_MAX; |
2553 | lq_sta->is_green = rs_use_green(sta, &priv->current_ht_config); | 2549 | lq_sta->is_green = rs_use_green(sta, &priv->current_ht_config); |
2554 | lq_sta->active_legacy_rate = priv->active_rate & ~(0x1000); | 2550 | lq_sta->active_legacy_rate = priv->active_rate & ~(0x1000); |
2555 | lq_sta->active_rate_basic = priv->active_rate_basic; | ||
2556 | lq_sta->band = priv->band; | 2551 | lq_sta->band = priv->band; |
2557 | /* | 2552 | /* |
2558 | * active_siso_rate mask includes 9 MBits (bit 5), and CCK (bits 0-3), | 2553 | * active_siso_rate mask includes 9 MBits (bit 5), and CCK (bits 0-3), |