Commit c2edd301 authored by Benjamin Berg's avatar Benjamin Berg Committed by Johannes Berg
Browse files

wifi: cfg80211: move regulatory_hint_found_beacon to be earlier 



These calls do not require any locking, so move them in preparation for
the next patches.

A minor change/bugfix is to not hint a beacon for nontransmitted BSSes

Signed-off-by: default avatarBenjamin Berg <benjamin.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230616094948.a5bf3558eae9.I33c7465d983c8bef19deb7a533ee475a16f91774@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 40e38c8d

net/wireless/scan.c

+22 −20
Original line number Diff line number Diff line
@@ -1971,6 +1971,18 @@ cfg80211_inform_single_bss_data(struct wiphy *wiphy, 
		tmp.pub.max_bssid_indicator = non_tx_data->max_bssid_indicator;

	} else {

		ts = jiffies;



		if (channel->band == NL80211_BAND_60GHZ) {

			bss_type = capability & WLAN_CAPABILITY_DMG_TYPE_MASK;

			if (bss_type == WLAN_CAPABILITY_DMG_TYPE_AP ||

			    bss_type == WLAN_CAPABILITY_DMG_TYPE_PBSS)

				regulatory_hint_found_beacon(wiphy, channel,

							     gfp);

		} else {

			if (capability & WLAN_CAPABILITY_ESS)

				regulatory_hint_found_beacon(wiphy, channel,

							     gfp);

		}

	}



	/*
@@ -2007,16 +2019,6 @@ cfg80211_inform_single_bss_data(struct wiphy *wiphy, 
	if (!res)

		return NULL;



	if (channel->band == NL80211_BAND_60GHZ) {

		bss_type = res->pub.capability & WLAN_CAPABILITY_DMG_TYPE_MASK;

		if (bss_type == WLAN_CAPABILITY_DMG_TYPE_AP ||

		    bss_type == WLAN_CAPABILITY_DMG_TYPE_PBSS)

			regulatory_hint_found_beacon(wiphy, channel, gfp);

	} else {

		if (res->pub.capability & WLAN_CAPABILITY_ESS)

			regulatory_hint_found_beacon(wiphy, channel, gfp);

	}



	if (non_tx_data) {

		/* this is a nontransmitting bss, we need to add it to

		 * transmitting bss' list if it is not there
@@ -2445,6 +2447,16 @@ cfg80211_inform_single_bss_frame_data(struct wiphy *wiphy, 
		capability = le16_to_cpu(mgmt->u.probe_resp.capab_info);

	}



	if (channel->band == NL80211_BAND_60GHZ) {

		bss_type = capability & WLAN_CAPABILITY_DMG_TYPE_MASK;

		if (bss_type == WLAN_CAPABILITY_DMG_TYPE_AP ||

		    bss_type == WLAN_CAPABILITY_DMG_TYPE_PBSS)

			regulatory_hint_found_beacon(wiphy, channel, gfp);

	} else {

		if (capability & WLAN_CAPABILITY_ESS)

			regulatory_hint_found_beacon(wiphy, channel, gfp);

	}



	ies = kzalloc(sizeof(*ies) + ielen, gfp);

	if (!ies)

		return NULL;
@@ -2478,16 +2490,6 @@ cfg80211_inform_single_bss_frame_data(struct wiphy *wiphy, 
	if (!res)

		return NULL;



	if (channel->band == NL80211_BAND_60GHZ) {

		bss_type = res->pub.capability & WLAN_CAPABILITY_DMG_TYPE_MASK;

		if (bss_type == WLAN_CAPABILITY_DMG_TYPE_AP ||

		    bss_type == WLAN_CAPABILITY_DMG_TYPE_PBSS)

			regulatory_hint_found_beacon(wiphy, channel, gfp);

	} else {

		if (res->pub.capability & WLAN_CAPABILITY_ESS)

			regulatory_hint_found_beacon(wiphy, channel, gfp);

	}



	trace_cfg80211_return_bss(&res->pub);

	/* cfg80211_bss_update gives us a referenced result */

	return &res->pub;