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

Commit aced43ce authored by Amar Singhal's avatar Amar Singhal Committed by Johannes Berg
Browse files

cfg80211: Call reg_notifier for self managed hints conditionally 



Currently the regulatory core does not call the regulatory callback
reg_notifier for self managed wiphys, but regulatory_hint_user() call is
independent of wiphy and is meant for all wiphys in the system. Even a
self managed wiphy may be interested in regulatory_hint_user() to know
the country code from a trusted regulatory domain change like a cellular
base station. Therefore, for the regulatory source
NL80211_REGDOM_SET_BY_USER and the user hint type
NL80211_USER_REG_HINT_CELL_BASE, call the regulatory notifier.

No current wlan driver uses the REGULATORY_WIPHY_SELF_MANAGED flag while
also registering the reg_notifier regulatory callback, therefore there
will be no impact on existing drivers without them being explicitly
modified to take advantage of this new possibility.

Signed-off-by: default avatarAmar Singhal <asinghal@codeaurora.org>
Signed-off-by: default avatarJouni Malinen <jouni@codeaurora.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 50f32718

net/wireless/reg.c

+29 −4
Original line number Diff line number Diff line
@@ -2768,6 +2768,21 @@ static void reg_process_hint(struct regulatory_request *reg_request) 
	reg_free_request(reg_request);

}



static void notify_self_managed_wiphys(struct regulatory_request *request)

{

	struct cfg80211_registered_device *rdev;

	struct wiphy *wiphy;



	list_for_each_entry(rdev, &cfg80211_rdev_list, list) {

		wiphy = &rdev->wiphy;

		if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED &&

		    request->initiator == NL80211_REGDOM_SET_BY_USER &&

		    request->user_reg_hint_type ==

				NL80211_USER_REG_HINT_CELL_BASE)

			reg_call_notifier(wiphy, request);

	}

}



static bool reg_only_self_managed_wiphys(void)

{

	struct cfg80211_registered_device *rdev;
@@ -2819,6 +2834,7 @@ static void reg_process_pending_hints(void) 


	spin_unlock(&reg_requests_lock);



	notify_self_managed_wiphys(reg_request);

	if (reg_only_self_managed_wiphys()) {

		reg_free_request(reg_request);

		return;
@@ -3698,17 +3714,26 @@ EXPORT_SYMBOL(regulatory_set_wiphy_regd_sync_rtnl); 


void wiphy_regulatory_register(struct wiphy *wiphy)

{

	struct regulatory_request *lr;

	struct regulatory_request *lr = get_last_request();



	/* self-managed devices ignore external hints */

	if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED)

	/* self-managed devices ignore beacon hints and country IE */

	if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) {

		wiphy->regulatory_flags |= REGULATORY_DISABLE_BEACON_HINTS |

					   REGULATORY_COUNTRY_IE_IGNORE;



		/*

		 * The last request may have been received before this

		 * registration call. Call the driver notifier if

		 * initiator is USER and user type is CELL_BASE.

		 */

		if (lr->initiator == NL80211_REGDOM_SET_BY_USER &&

		    lr->user_reg_hint_type == NL80211_USER_REG_HINT_CELL_BASE)

			reg_call_notifier(wiphy, lr);

	}



	if (!reg_dev_ignore_cell_hint(wiphy))

		reg_num_devs_support_basehint++;



	lr = get_last_request();

	wiphy_update_regulatory(wiphy, lr->initiator);

	wiphy_all_share_dfs_chan_state(wiphy);

}