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

Commit 71f2c347 authored by Masashi Honma's avatar Masashi Honma Committed by Johannes Berg
Browse files

mac80211: End the MPSP even if EOSP frame was not acked 



If QoS frame with EOSP (end of service period) subfield=1 sent by local
peer was not acked by remote peer, local peer did not end the MPSP. This
prevents local peer from going to DOZE state. And if the remote peer
goes away without closing connection, local peer continues AWAKE state
and wastes battery.

Signed-off-by: default avatarMasashi Honma <masashi.honma@gmail.com>
Acked-by: default avatarBob Copeland <me@bobcopeland.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6b07d9ca

net/mac80211/status.c

+7 −7
Original line number Diff line number Diff line
@@ -771,6 +771,13 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) 
			clear_sta_flag(sta, WLAN_STA_SP);



		acked = !!(info->flags & IEEE80211_TX_STAT_ACK);



		/* mesh Peer Service Period support */

		if (ieee80211_vif_is_mesh(&sta->sdata->vif) &&

		    ieee80211_is_data_qos(fc))

			ieee80211_mpsp_trigger_process(

				ieee80211_get_qos_ctl(hdr), sta, true, acked);



		if (!acked && test_sta_flag(sta, WLAN_STA_PS_STA)) {

			/*

			 * The STA is in power save mode, so assume
@@ -781,13 +788,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) 
			return;

		}



		/* mesh Peer Service Period support */

		if (ieee80211_vif_is_mesh(&sta->sdata->vif) &&

		    ieee80211_is_data_qos(fc))

			ieee80211_mpsp_trigger_process(

					ieee80211_get_qos_ctl(hdr),

					sta, true, acked);



		if (ieee80211_hw_check(&local->hw, HAS_RATE_CONTROL) &&

		    (ieee80211_is_data(hdr->frame_control)) &&

		    (rates_idx != -1))