From a53f99ed1c9dd89162447868c5ca9ba76558592b Mon Sep 17 00:00:00 2001
From: Rajkumar Manoharan <rmanoharan@atheros.com>
Date: Wed, 2 Feb 2011 22:57:53 +0530
Subject: [PATCH] --- yaml --- r: 237045 b: refs/heads/master c:
 8c99f69182fb9550ceedf599b32af335e743367b h: refs/heads/master i:   237043:
 61e67b0d70b4e81619639d46cf79c2dd9cdc66f7 v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/rx.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eabacfacbf60..5cbee46237e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24d24c627cadcbff682fbf8448a775851bef833c
+refs/heads/master: 8c99f69182fb9550ceedf599b32af335e743367b
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index c08b8e90bbcb..b37c3415f0ea 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -1952,7 +1952,10 @@ ieee80211_rx_h_data(struct ieee80211_rx_data *rx)
 	dev->stats.rx_bytes += rx->skb->len;
 
 	if (local->ps_sdata && local->hw.conf.dynamic_ps_timeout > 0 &&
-	    !is_multicast_ether_addr(((struct ethhdr *)rx->skb->data)->h_dest)) {
+	    !is_multicast_ether_addr(
+		    ((struct ethhdr *)rx->skb->data)->h_dest) &&
+	    (!local->scanning &&
+	     !test_bit(SDATA_STATE_OFFCHANNEL, &sdata->state))) {
 			mod_timer(&local->dynamic_ps_timer, jiffies +
 			 msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout));
 	}