Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 170975
b: refs/heads/master
c: 5d07b66
h: refs/heads/master
i:
  170973: 3f33a56
  170971: 58a5c79
  170967: eb403fc
  170959: fe1920f
  170943: 9446710
v: v3
  • Loading branch information
Teemu Paasikivi authored and John W. Linville committed Oct 27, 2009
1 parent dc81fa5 commit 20849e9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 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: a410264553447ff90bf13e3662684e794e5ff83e
refs/heads/master: 5d07b668f28175a39e4ad06eccab75e8275266d1
11 changes: 3 additions & 8 deletions trunk/drivers/net/wireless/wl12xx/wl1271_rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,10 @@ static void wl1271_rx_status(struct wl1271 *wl,
if (desc->flags & WL1271_RX_DESC_ENCRYPT_MASK) {
status->flag |= RX_FLAG_IV_STRIPPED | RX_FLAG_MMIC_STRIPPED;

if (likely(!(desc->flags & WL1271_RX_DESC_DECRYPT_FAIL)))
if (likely(!(desc->status & WL1271_RX_DESC_DECRYPT_FAIL)))
status->flag |= RX_FLAG_DECRYPTED;
/* FIXME: Flag should be also set when using 5 GHz band.
* At the moment chip reports MIC failed on all packets,
* so flag is silently discarded.
*/
if (unlikely(desc->flags & WL1271_RX_DESC_MIC_FAIL))
if (status->band != IEEE80211_BAND_5GHZ)
status->flag |= RX_FLAG_MMIC_ERROR;
if (unlikely(desc->status & WL1271_RX_DESC_MIC_FAIL))
status->flag |= RX_FLAG_MMIC_ERROR;
}
}

Expand Down

0 comments on commit 20849e9

Please sign in to comment.