Skip to content

Commit 9fef654

Browse files
egrumbachjmberg-intel
authored andcommitted
mac80211: always update the PM state of a peer on MGMT / DATA frames
The 2016 version of the spec is more generic about when the AP should update the power management state of the peer: the AP shall update the state based on any management or data frames. This means that even non-bufferable management frames should be looked at to update to maintain the power management state of the peer. This can avoid problematic cases for example if a station disappears while being asleep and then re-appears. The AP would remember it as in power save, but the Authentication frame couldn't be used to set the peer as awake again. Note that this issues wasn't really critical since at some point (after the association) we would have removed the station and created another one with all the states cleared. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent e16ea4b commit 9fef654

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

net/mac80211/rx.c

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,23 +1607,16 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
16071607

16081608
/*
16091609
* Change STA power saving mode only at the end of a frame
1610-
* exchange sequence.
1610+
* exchange sequence, and only for a data or management
1611+
* frame as specified in IEEE 802.11-2016 11.2.3.2
16111612
*/
16121613
if (!ieee80211_hw_check(&sta->local->hw, AP_LINK_PS) &&
16131614
!ieee80211_has_morefrags(hdr->frame_control) &&
1614-
!ieee80211_is_back_req(hdr->frame_control) &&
1615+
(ieee80211_is_mgmt(hdr->frame_control) ||
1616+
ieee80211_is_data(hdr->frame_control)) &&
16151617
!(status->rx_flags & IEEE80211_RX_DEFERRED_RELEASE) &&
16161618
(rx->sdata->vif.type == NL80211_IFTYPE_AP ||
1617-
rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN) &&
1618-
/*
1619-
* PM bit is only checked in frames where it isn't reserved,
1620-
* in AP mode it's reserved in non-bufferable management frames
1621-
* (cf. IEEE 802.11-2012 8.2.4.1.7 Power Management field)
1622-
* BAR frames should be ignored as specified in
1623-
* IEEE 802.11-2012 10.2.1.2.
1624-
*/
1625-
(!ieee80211_is_mgmt(hdr->frame_control) ||
1626-
ieee80211_is_bufferable_mmpdu(hdr->frame_control))) {
1619+
rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN)) {
16271620
if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
16281621
if (!ieee80211_has_pm(hdr->frame_control))
16291622
sta_ps_end(sta);

0 commit comments

Comments
 (0)