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

Commit 3dbab9e3 authored by Miri Korenblit's avatar Miri Korenblit Committed by Greg Kroah-Hartman
Browse files

cfg80211: set custom regdomain after wiphy registration 



commit 1b7b3ac8ff3317cdcf07a1c413de9bdb68019c2b upstream.

We used to set regulatory info before the registration of
the device and then the regulatory info didn't get set, because
the device isn't registered so there isn't a device to set the
regulatory info for. So set the regulatory info after the device
registration.
Call reg_process_self_managed_hints() once again after the device
registration because it does nothing before it.

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210618133832.c96eadcffe80.I86799c2c866b5610b4cf91115c21d8ceb525c5aa@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 039fa25d

net/wireless/core.c

+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright 2006-2010		Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright 2015-2017	Intel Deutschland GmbH

 * Copyright (C) 2018-2019 Intel Corporation

 * Copyright (C) 2018-2021 Intel Corporation

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -891,9 +891,6 @@ int wiphy_register(struct wiphy *wiphy) 
		return res;

	}



	/* set up regulatory info */

	wiphy_regulatory_register(wiphy);



	list_add_rcu(&rdev->list, &cfg80211_rdev_list);

	cfg80211_rdev_list_generation++;
@@ -904,6 +901,9 @@ int wiphy_register(struct wiphy *wiphy) 
	cfg80211_debugfs_rdev_add(rdev);

	nl80211_notify_wiphy(rdev, NL80211_CMD_NEW_WIPHY);



	/* set up regulatory info */

	wiphy_regulatory_register(wiphy);



	if (wiphy->regulatory_flags & REGULATORY_CUSTOM_REG) {

		struct regulatory_request request;

net/wireless/reg.c

+1 −0
Original line number Diff line number Diff line
@@ -3790,6 +3790,7 @@ void wiphy_regulatory_register(struct wiphy *wiphy) 


	wiphy_update_regulatory(wiphy, lr->initiator);

	wiphy_all_share_dfs_chan_state(wiphy);

	reg_process_self_managed_hints();

}



void wiphy_regulatory_deregister(struct wiphy *wiphy)