X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fwireless%2Fwl1251%2Frx.c;h=dc7ad4534830316b61131a95650fc64a7ca2aa16;hb=64fe08cf412c87266174fed3f591c99c55cb0182;hp=6af35265c900173cc58dcf36c0c68a5b595e3157;hpb=2bb732cdb48d271ff7a910260ffb851fb4bc8a28;p=pandora-kernel.git

diff --git a/drivers/net/wireless/wl1251/rx.c b/drivers/net/wireless/wl1251/rx.c
index 6af35265c900..dc7ad4534830 100644
--- a/drivers/net/wireless/wl1251/rx.c
+++ b/drivers/net/wireless/wl1251/rx.c
@@ -83,7 +83,7 @@ static void wl1251_rx_status(struct wl1251 *wl,
 
 	status->flag |= RX_FLAG_MACTIME_MPDU;
 
-	if (desc->flags & RX_DESC_ENCRYPTION_MASK) {
+	if (!wl->monitor_present && (desc->flags & RX_DESC_ENCRYPTION_MASK)) {
 		status->flag |= RX_FLAG_IV_STRIPPED | RX_FLAG_MMIC_STRIPPED;
 
 		if (likely(!(desc->flags & RX_DESC_DECRYPT_FAIL)))
@@ -186,6 +186,8 @@ static void wl1251_rx_body(struct wl1251 *wl,
 
 	if ((*fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_BEACON)
 		beacon = 1;
+	else
+		wl->last_io_jiffies = jiffies;
 
 	wl1251_rx_status(wl, desc, &status, beacon);