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

Commit e16ea4bb authored by Adiel Aloni's avatar Adiel Aloni Committed by Johannes Berg
Browse files

mac80211_hwsim: enforce PS_MANUAL_POLL to be set after PS_ENABLED 



Enforce using PS_MANUAL_POLL in ps hwsim debugfs to trigger a poll,
only if PS_ENABLED was set before.
This is required due to commit c9491367b759 ("mac80211: always update the
PM state of a peer on MGMT / DATA frames") that enforces the ap to
check only mgmt/data frames ps bit, and then update station's power save
accordingly.
When sending only ps-poll (control frame) the ap will not be aware that
the station entered power save.
Setting ps enable before triggering ps_poll, will send NDP with PM bit
enabled first.

Signed-off-by: default avatarAdiel Aloni <adiel.aloni@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a9d09bc1

drivers/net/wireless/mac80211_hwsim.c

+11 −6
Original line number Diff line number Diff line
@@ -727,16 +727,21 @@ static int hwsim_fops_ps_write(void *dat, u64 val) 
	    val != PS_MANUAL_POLL)

		return -EINVAL;



	old_ps = data->ps;

	data->ps = val;



	local_bh_disable();

	if (val == PS_MANUAL_POLL) {

		if (data->ps != PS_ENABLED)

			return -EINVAL;

		local_bh_disable();

		ieee80211_iterate_active_interfaces_atomic(

			data->hw, IEEE80211_IFACE_ITER_NORMAL,

			hwsim_send_ps_poll, data);

		data->ps_poll_pending = true;

	} else if (old_ps == PS_DISABLED && val != PS_DISABLED) {

		local_bh_enable();

		return 0;

	}

	old_ps = data->ps;

	data->ps = val;



	local_bh_disable();

	if (old_ps == PS_DISABLED && val != PS_DISABLED) {

		ieee80211_iterate_active_interfaces_atomic(

			data->hw, IEEE80211_IFACE_ITER_NORMAL,

			hwsim_send_nullfunc_ps, data);