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

Commit dc8c4585 authored by Jouni Malinen's avatar Jouni Malinen Committed by John W. Linville
Browse files

ath9k: Set PM field in frame control when in PS mode 



mac80211 does not set PM field for normal data frames, so we need to
update that based on the current PS mode when using PS-Poll
(timeout=0) power save mode.

This allows the AP to remain in sync with our PS state. However, there
is still a potential race condition between PS state changes when
multiple TX queues are used and nullfunc and PS-Poll frames use
different queue. That corner case may need to be handled separately by
changing which queue is used either in ath9k or mac80211.

Signed-off-by: default avatarJouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent aa68aeaa

drivers/net/wireless/ath/ath9k/main.c

+15 −0
Original line number Diff line number Diff line
@@ -2088,6 +2088,21 @@ static int ath9k_tx(struct ieee80211_hw *hw, 
		goto exit;

	}



	if (sc->hw->conf.flags & IEEE80211_CONF_PS) {

		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;

		/*

		 * mac80211 does not set PM field for normal data frames, so we

		 * need to update that based on the current PS mode.

		 */

		if (ieee80211_is_data(hdr->frame_control) &&

		    !ieee80211_is_nullfunc(hdr->frame_control) &&

		    !ieee80211_has_pm(hdr->frame_control)) {

			DPRINTF(sc, ATH_DBG_PS, "Add PM=1 for a TX frame "

				"while in PS mode\n");

			hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PM);

		}

	}



	if (unlikely(sc->sc_ah->power_mode != ATH9K_PM_AWAKE)) {

		/*

		 * We are using PS-Poll and mac80211 can request TX while in