diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-11 15:39:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-11 15:39:21 -0400 |
| commit | 9687c637388f63b87fcc18eee6e65bcfca4f49ca (patch) | |
| tree | 0929bb8dc602c4f86b6b2e95bca94015de2b0868 /drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |
| parent | 258daca2bc9f97ace65c9480c901fddfce1e20cf (diff) | |
| parent | 094daf7db7c47861009899ce23f9177d761e20b0 (diff) | |
Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rs.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index c14f8d6fd7d8..7d6a3bf64950 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |||
| @@ -2273,9 +2273,6 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, | |||
| 2273 | info->flags & IEEE80211_TX_CTL_NO_ACK) | 2273 | info->flags & IEEE80211_TX_CTL_NO_ACK) |
| 2274 | return; | 2274 | return; |
| 2275 | 2275 | ||
| 2276 | if (!sta || !lq_sta) | ||
| 2277 | return; | ||
| 2278 | |||
| 2279 | lq_sta->supp_rates = sta->supp_rates[lq_sta->band]; | 2276 | lq_sta->supp_rates = sta->supp_rates[lq_sta->band]; |
| 2280 | 2277 | ||
| 2281 | tid = rs_tl_add_packet(lq_sta, hdr); | 2278 | tid = rs_tl_add_packet(lq_sta, hdr); |