From 20849e9bee419c54a37c8db27462812d21b754bc Mon Sep 17 00:00:00 2001 From: Teemu Paasikivi Date: Tue, 13 Oct 2009 12:47:52 +0300 Subject: [PATCH] --- yaml --- r: 170975 b: refs/heads/master c: 5d07b668f28175a39e4ad06eccab75e8275266d1 h: refs/heads/master i: 170973: 3f33a568f3796947336073f19805813ce851d97e 170971: 58a5c79c29b181428f06aae6f2660c834c40cd5b 170967: eb403fcd1e10e7fd0b16ebcb93c6fce0c23df19f 170959: fe1920f8d4c9e322f33dd45f03a56becaee63aab 170943: 94467101f9a3aef92279ccf05ddcd9c1d934d6b7 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/wl1271_rx.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index b28c15497d94..67cd335c8777 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a410264553447ff90bf13e3662684e794e5ff83e +refs/heads/master: 5d07b668f28175a39e4ad06eccab75e8275266d1 diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c b/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c index 1dd84582ef32..1ea3f41912a6 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c @@ -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; } }