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

Commit 104f5a62 authored by Eliad Peller's avatar Eliad Peller Committed by Johannes Berg
Browse files

mac80211: clear sdata->radar_required 



If ieee80211_vif_use_channel() fails, we have to clear
sdata->radar_required (which we might have just set).

Failing to do it results in stale radar_required field
which prevents starting new scan requests.

Reported-by: default avatarJouni Malinen <j@w1.fi>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
[use false instead of 0]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f2831e20

net/mac80211/chan.c

+5 −0
Original line number Diff line number Diff line
@@ -1508,6 +1508,8 @@ static void __ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata) 
	if (ieee80211_chanctx_refcount(local, ctx) == 0)

		ieee80211_free_chanctx(local, ctx);



	sdata->radar_required = false;



	/* Unreserving may ready an in-place reservation. */

	if (use_reserved_switch)

		ieee80211_vif_use_reserved_switch(local);
@@ -1566,6 +1568,9 @@ int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata, 
	ieee80211_recalc_smps_chanctx(local, ctx);

	ieee80211_recalc_radar_chanctx(local, ctx);

 out:

	if (ret)

		sdata->radar_required = false;



	mutex_unlock(&local->chanctx_mtx);

	return ret;

}