From 54d49faa10b701616f9e12b630222c307e1ea8c7 Mon Sep 17 00:00:00 2001
From: Vivek Natarajan <vnatarajan@atheros.com>
Date: Mon, 8 Feb 2010 17:47:01 +0530
Subject: [PATCH] --- yaml --- r: 184095 b: refs/heads/master c:
 e15276a4b220c54db665cf46a92bd9ceb9aeb052 h: refs/heads/master i:   184093:
 3cab64b1f9db15146ad52518a01b6d0e08d85f76   184091:
 70ab48983968219db6466cd519f3f1ac8216b89a   184087:
 b859c92025d8ca72bc0d6b3c9ca879bea7f6d771   184079:
 e082c03a46209d7ac222a7a52c2b61386ccfd17e   184063:
 a0d35beec6f60933992bc592c723d0364697f4d7 v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/rx.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8b116e4de9c6..b056e764e7bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 209c671db7a917740ab9873d442b10ae7e369937
+refs/heads/master: e15276a4b220c54db665cf46a92bd9ceb9aeb052
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 01dba7618397..c9755f3d986c 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -1719,6 +1719,7 @@ static ieee80211_rx_result debug_noinline
 ieee80211_rx_h_data(struct ieee80211_rx_data *rx)
 {
 	struct ieee80211_sub_if_data *sdata = rx->sdata;
+	struct ieee80211_local *local = rx->local;
 	struct net_device *dev = sdata->dev;
 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
 	__le16 fc = hdr->frame_control;
@@ -1750,6 +1751,13 @@ ieee80211_rx_h_data(struct ieee80211_rx_data *rx)
 	dev->stats.rx_packets++;
 	dev->stats.rx_bytes += rx->skb->len;
 
+	if (ieee80211_is_data(hdr->frame_control) &&
+	    !is_multicast_ether_addr(hdr->addr1) &&
+	    local->hw.conf.dynamic_ps_timeout > 0 && local->ps_sdata) {
+			mod_timer(&local->dynamic_ps_timer, jiffies +
+			 msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout));
+	}
+
 	ieee80211_deliver_skb(rx);
 
 	return RX_QUEUED;