diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-11-03 20:52:33 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-11 17:09:05 -0500 |
commit | 14077f5b7a28bdcd166faed2c0b36fad9f3eadda (patch) | |
tree | e7cecc0d7f280a4c0155a330c8e42c17af0cf5fb /drivers/net/wireless/ath/ath9k/recv.c | |
parent | 207e96854e39380fce8b589bbbdaf6e9a83b9151 (diff) |
ath9k: remove temp variable ratecode from ath_rx_prepare()
Its just a distraction when reading the code, instead use the
rx_stats->rs_rate directly.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/recv.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index 6e00eafc9b24..9e6dded399fd 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c | |||
@@ -161,7 +161,6 @@ static int ath_rx_prepare(struct ath_common *common, | |||
161 | { | 161 | { |
162 | struct ath_hw *ah = common->ah; | 162 | struct ath_hw *ah = common->ah; |
163 | struct ieee80211_hdr *hdr; | 163 | struct ieee80211_hdr *hdr; |
164 | u8 ratecode; | ||
165 | __le16 fc; | 164 | __le16 fc; |
166 | struct ieee80211_sta *sta; | 165 | struct ieee80211_sta *sta; |
167 | struct ath_node *an; | 166 | struct ath_node *an; |
@@ -174,16 +173,14 @@ static int ath_rx_prepare(struct ath_common *common, | |||
174 | if (!ath9k_rx_accept(common, skb, rx_status, rx_stats, decrypt_error)) | 173 | if (!ath9k_rx_accept(common, skb, rx_status, rx_stats, decrypt_error)) |
175 | goto rx_next; | 174 | goto rx_next; |
176 | 175 | ||
177 | ratecode = rx_stats->rs_rate; | 176 | if (rx_stats->rs_rate & 0x80) { |
178 | |||
179 | if (ratecode & 0x80) { | ||
180 | /* HT rate */ | 177 | /* HT rate */ |
181 | rx_status->flag |= RX_FLAG_HT; | 178 | rx_status->flag |= RX_FLAG_HT; |
182 | if (rx_stats->rs_flags & ATH9K_RX_2040) | 179 | if (rx_stats->rs_flags & ATH9K_RX_2040) |
183 | rx_status->flag |= RX_FLAG_40MHZ; | 180 | rx_status->flag |= RX_FLAG_40MHZ; |
184 | if (rx_stats->rs_flags & ATH9K_RX_GI) | 181 | if (rx_stats->rs_flags & ATH9K_RX_GI) |
185 | rx_status->flag |= RX_FLAG_SHORT_GI; | 182 | rx_status->flag |= RX_FLAG_SHORT_GI; |
186 | rx_status->rate_idx = ratecode & 0x7f; | 183 | rx_status->rate_idx = rx_stats->rs_rate & 0x7f; |
187 | } else { | 184 | } else { |
188 | struct ieee80211_supported_band *sband; | 185 | struct ieee80211_supported_band *sband; |
189 | unsigned int i = 0; | 186 | unsigned int i = 0; |