---

yaml
---
r: 184095
b: refs/heads/master
c: e15276a
h: refs/heads/master
i:
  184093: 3cab64b
  184091: 70ab489
  184087: b859c92
  184079: e082c03
  184063: a0d35be
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 209c671db7a917740ab9873d442b10ae7e369937
+refs/heads/master: e15276a4b220c54db665cf46a92bd9ceb9aeb052

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;