Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 171699
b: refs/heads/master
c: 14077f5
h: refs/heads/master
i:
  171697: cecb130
  171695: ab671c2
v: v3
  • Loading branch information
Luis R. Rodriguez authored and John W. Linville committed Nov 11, 2009
1 parent ecfab60 commit 0b1c49a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 207e96854e39380fce8b589bbbdaf6e9a83b9151
refs/heads/master: 14077f5b7a28bdcd166faed2c0b36fad9f3eadda
7 changes: 2 additions & 5 deletions trunk/drivers/net/wireless/ath/ath9k/recv.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ static int ath_rx_prepare(struct ath_common *common,
{
struct ath_hw *ah = common->ah;
struct ieee80211_hdr *hdr;
u8 ratecode;
__le16 fc;
struct ieee80211_sta *sta;
struct ath_node *an;
Expand All @@ -174,16 +173,14 @@ static int ath_rx_prepare(struct ath_common *common,
if (!ath9k_rx_accept(common, skb, rx_status, rx_stats, decrypt_error))
goto rx_next;

ratecode = rx_stats->rs_rate;

if (ratecode & 0x80) {
if (rx_stats->rs_rate & 0x80) {
/* HT rate */
rx_status->flag |= RX_FLAG_HT;
if (rx_stats->rs_flags & ATH9K_RX_2040)
rx_status->flag |= RX_FLAG_40MHZ;
if (rx_stats->rs_flags & ATH9K_RX_GI)
rx_status->flag |= RX_FLAG_SHORT_GI;
rx_status->rate_idx = ratecode & 0x7f;
rx_status->rate_idx = rx_stats->rs_rate & 0x7f;
} else {
struct ieee80211_supported_band *sband;
unsigned int i = 0;
Expand Down

0 comments on commit 0b1c49a

Please sign in to comment.