Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / net / wireless / wl1251 / rx.c

diff --git a/drivers/net/wireless/wl1251/rx.c b/drivers/net/wireless/wl1251/rx.c
index 6af3526..c069669 100644 (file)
--- a/drivers/net/wireless/wl1251/rx.c
+++ b/drivers/net/wireless/wl1251/rx.c
@@ -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);