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

mac80211: Fix a race on enabling power save. 



There is a race on sending a data frame before the tx completion
of nullfunc frame for enabling power save. As the data quickly
follows the nullfunc frame, the AP thinks that the station is out
of power save and continues to send the frames. Whereas in the
station, the nullfunc ack will be processed after the tx completion
of data frame and mac80211 goes to powersave. Thus the power
save state mismatch between the station and the AP causes some
data loss and some applications fail because of that. This patch
fixes this issue.

Signed-off-by: default avatarVivek Natarajan <vnatarajan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 05db8c57

net/mac80211/mlme.c

+13 −1
Original line number Diff line number Diff line
@@ -738,9 +738,19 @@ void ieee80211_dynamic_ps_enable_work(struct work_struct *work) 
		return;



	if ((local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK) &&

	    (!(ifmgd->flags & IEEE80211_STA_NULLFUNC_ACKED)))

	    (!(ifmgd->flags & IEEE80211_STA_NULLFUNC_ACKED))) {

		netif_tx_stop_all_queues(sdata->dev);

		/*

		 * Flush all the frames queued in the driver before

		 * going to power save

		 */

		drv_flush(local, false);

		ieee80211_send_nullfunc(local, sdata, 1);



		/* Flush once again to get the tx status of nullfunc frame */

		drv_flush(local, false);

	}



	if (!((local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) &&

	      (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK)) ||

	    (ifmgd->flags & IEEE80211_STA_NULLFUNC_ACKED)) {
@@ -748,6 +758,8 @@ void ieee80211_dynamic_ps_enable_work(struct work_struct *work) 
		local->hw.conf.flags |= IEEE80211_CONF_PS;

		ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);

	}



	netif_tx_start_all_queues(sdata->dev);

}



void ieee80211_dynamic_ps_timer(unsigned long data)

net/mac80211/status.c

+0 −2
Original line number Diff line number Diff line
@@ -318,8 +318,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) 
		if (info->flags & IEEE80211_TX_STAT_ACK) {

			local->ps_sdata->u.mgd.flags |=

					IEEE80211_STA_NULLFUNC_ACKED;

			ieee80211_queue_work(&local->hw,

					&local->dynamic_ps_enable_work);

		} else

			mod_timer(&local->dynamic_ps_timer, jiffies +

					msecs_to_jiffies(10));

CRA Git | Maintained and supported by SUSTech CRA and CCSE