Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e15276a4 authored by Vivek Natarajan's avatar Vivek Natarajan Committed by John W. Linville
Browse files

mac80211: Reset dynamic ps timer in Rx path. 



The current mac80211 implementation enables power save if there
is no Tx traffic for a specific timeout. Hence, PS is triggered
even if there is a continuous Rx only traffic(like UDP) going on.
This makes the drivers to wait on the tim bit in the next beacon
to awake which leads to redundant sleep-wake cycles.
Fix this by restarting the dynamic ps timer on receiving every
data packet.

Signed-off-by: default avatarVivek Natarajan <vnatarajan@atheros.com>
CC: stable@kernel.org
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 209c671d

net/mac80211/rx.c

+8 −0
Original line number Diff line number Diff line
@@ -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;