stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Finn Behrens <me@kloenk.dev>, Finn Behrens <fin@nyantec.com>,
	Johannes Berg <johannes.berg@intel.com>,
	Sasha Levin <sashal@kernel.org>,
	davem@davemloft.net, kuba@kernel.org, johannes@sipsolutions.net,
	netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 05/19] nl80211: reset regdom when reloading regdb
Date: Mon, 20 Dec 2021 20:59:00 -0500	[thread overview]
Message-ID: <20211221015914.116767-5-sashal@kernel.org> (raw)
In-Reply-To: <20211221015914.116767-1-sashal@kernel.org>

From: Finn Behrens <me@kloenk.dev>

[ Upstream commit 1eda919126b420fee6b8d546f7f728fbbd4b8f11 ]

Reload the regdom when the regulatory db is reloaded.
Otherwise, the user had to change the regulatoy domain
to a different one and then reset it to the correct
one to have a new regulatory db take effect after a
reload.

Signed-off-by: Finn Behrens <fin@nyantec.com>
Link: https://lore.kernel.org/r/YaIIZfxHgqc/UTA7@gimli.kloenk.dev
[edit commit message]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 include/net/regulatory.h |  1 +
 net/wireless/reg.c       | 27 +++++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 47f06f6f5a67c..0cf9335431e07 100644
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -83,6 +83,7 @@ struct regulatory_request {
 	enum nl80211_dfs_regions dfs_region;
 	bool intersect;
 	bool processed;
+	bool reload;
 	enum environment_cap country_ie_env;
 	struct list_head list;
 };
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index a04fdfb35f070..341c88972aed1 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -133,6 +133,7 @@ static u32 reg_is_indoor_portid;
 
 static void restore_regulatory_settings(bool reset_user, bool cached);
 static void print_regdomain(const struct ieee80211_regdomain *rd);
+static void reg_process_hint(struct regulatory_request *reg_request);
 
 static const struct ieee80211_regdomain *get_cfg80211_regdom(void)
 {
@@ -1079,6 +1080,8 @@ int reg_reload_regdb(void)
 	const struct firmware *fw;
 	void *db;
 	int err;
+	const struct ieee80211_regdomain *current_regdomain;
+	struct regulatory_request *request;
 
 	err = request_firmware(&fw, "regulatory.db", &reg_pdev->dev);
 	if (err)
@@ -1099,8 +1102,27 @@ int reg_reload_regdb(void)
 	if (!IS_ERR_OR_NULL(regdb))
 		kfree(regdb);
 	regdb = db;
-	rtnl_unlock();
 
+	/* reset regulatory domain */
+	current_regdomain = get_cfg80211_regdom();
+
+	request = kzalloc(sizeof(*request), GFP_KERNEL);
+	if (!request) {
+		err = -ENOMEM;
+		goto out_unlock;
+	}
+
+	request->wiphy_idx = WIPHY_IDX_INVALID;
+	request->alpha2[0] = current_regdomain->alpha2[0];
+	request->alpha2[1] = current_regdomain->alpha2[1];
+	request->initiator = NL80211_USER_REG_HINT_USER;
+	request->user_reg_hint_type = NL80211_USER_REG_HINT_USER;
+	request->reload = true;
+
+	reg_process_hint(request);
+
+out_unlock:
+	rtnl_unlock();
  out:
 	release_firmware(fw);
 	return err;
@@ -2657,7 +2679,8 @@ reg_process_hint_user(struct regulatory_request *user_request)
 
 	treatment = __reg_process_hint_user(user_request);
 	if (treatment == REG_REQ_IGNORE ||
-	    treatment == REG_REQ_ALREADY_SET)
+	    (treatment == REG_REQ_ALREADY_SET &&
+	     !user_request->reload))
 		return REG_REQ_IGNORE;
 
 	user_request->intersect = treatment == REG_REQ_INTERSECT;
-- 
2.34.1


  parent reply	other threads:[~2021-12-21  2:00 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-21  1:58 [PATCH AUTOSEL 5.10 01/19] ARM: dts: ls1021a-tsn: update RGMII delays for sja1105 switch Sasha Levin
2021-12-21  1:58 ` [PATCH AUTOSEL 5.10 02/19] ARM: rockchip: Use memcpy_toio instead of memcpy on smp bring-up Sasha Levin
2021-12-21  1:58 ` [PATCH AUTOSEL 5.10 03/19] mac80211: set up the fwd_skb->dev for mesh forwarding Sasha Levin
2021-12-21  1:58 ` [PATCH AUTOSEL 5.10 04/19] mac80211: fix a memory leak where sta_info is not freed Sasha Levin
2021-12-21  1:59 ` Sasha Levin [this message]
2021-12-21  1:59 ` [PATCH AUTOSEL 5.10 06/19] iwlwifi: fix LED dependencies Sasha Levin
2021-12-21  1:59 ` [PATCH AUTOSEL 5.10 07/19] phonet: refcount leak in pep_sock_accep Sasha Levin
2021-12-21  1:59 ` [PATCH AUTOSEL 5.10 08/19] net: bcmgenet: Fix NULL vs IS_ERR() checking Sasha Levin
2021-12-21  1:59 ` [PATCH AUTOSEL 5.10 09/19] scsi: pm8001: Fix phys_to_virt() usage on dma_addr_t Sasha Levin
2021-12-21  1:59 ` [PATCH AUTOSEL 5.10 10/19] mac80211: Fix the size used for building probe request Sasha Levin
2021-12-21  1:59 ` [PATCH AUTOSEL 5.10 11/19] mac80211: update channel context before station state Sasha Levin
2021-12-21  1:59 ` [PATCH AUTOSEL 5.10 12/19] mac80211: do drv_reconfig_complete() before restarting all Sasha Levin
2021-12-21  1:59 ` [PATCH AUTOSEL 5.10 13/19] drm/amd/display: Reset DMCUB before HW init Sasha Levin
2021-12-21  1:59 ` [PATCH AUTOSEL 5.10 14/19] drm/amdgpu: correct the wrong cached state for GMC on PICASSO Sasha Levin
2021-12-21  1:59 ` [PATCH AUTOSEL 5.10 15/19] block: reduce kblockd_mod_delayed_work_on() CPU consumption Sasha Levin
2021-12-21  1:59 ` [PATCH AUTOSEL 5.10 16/19] net: usb: lan78xx: add Allied Telesis AT29M2-AF Sasha Levin
2021-12-21  1:59 ` [PATCH AUTOSEL 5.10 17/19] virtio_net: fix rx_drops stat for small pkts Sasha Levin
2021-12-21  1:59 ` [PATCH AUTOSEL 5.10 18/19] bpf: Make 32->64 bounds propagation slightly more robust Sasha Levin
2021-12-21  1:59 ` [PATCH AUTOSEL 5.10 19/19] Revert "block: reduce kblockd_mod_delayed_work_on() CPU consumption" Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211221015914.116767-5-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=davem@davemloft.net \
    --cc=fin@nyantec.com \
    --cc=johannes.berg@intel.com \
    --cc=johannes@sipsolutions.net \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=me@kloenk.dev \
    --cc=netdev@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).