Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Finn Behrens <fin@nyantec.com>
To:     linux-wireless@vger.kernel.org
Subject: [PATCH] nl80211: reset regdom when reloading regdb
Message-ID: <8c3e46ac-331b-0922-5379-0cb1ef61a83b@nyantec.com>
Date:   Sat, 21 Nov 2020 13:45:03 +0100
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Content-Language: en-US
Precedence: bulk

reset the regdom when NL80211_CMD_RELOAD_REGDB is send

Signed-off-by: Finn Behrens <fin@nyantec.com>
---
include/net/regulatory.h | 1 +
net/wireless/reg.c | 31 +++++++++++++++++++++++++++++--
2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 47f06f6f5a67..0cf9335431e0 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 a04fdfb35f07..50314916b020 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -199,6 +199,7 @@ static struct regulatory_request *get_last_request(vo=
id)
/* Used to queue up regulatory hints */
static LIST_HEAD(reg_requests_list);
static spinlock_t reg_requests_lock;
+static void queue_regulatory_request(struct regulatory_request *request)=
;
/* Used to queue up beacon hints for review */
static LIST_HEAD(reg_pending_beacons);
@@ -1081,10 +1082,13 @@ int reg_reload_regdb(void)
int err;
err =3D request_firmware(&fw, "regulatory.db", &reg_pdev->dev);
- if (err)
+ if (err) {
+ pr_info("failed to load regulatory.db\n");
return err;
+ }
if (!valid_regdb(fw->data, fw->size)) {
+ pr_info("loaded regulatory.db is malformed or signature is
missing/invalid\n");
err =3D -ENODATA;
goto out;
}
@@ -1101,6 +1105,28 @@ int reg_reload_regdb(void)
regdb =3D db;
rtnl_unlock();
+ // reset regulatory
+ const struct ieee80211_regdomain *current_regdomain =3D NULL;
+
+ current_regdomain =3D get_cfg80211_regdom();
+
+ struct regulatory_request *request =3D NULL;
+
+ request =3D kzalloc(sizeof(*request), GFP_KERNEL);
+ if (!request) {
+ err =3D -ENOMEM;
+ goto out;
+ }
+
+ request->wiphy_idx =3D WIPHY_IDX_INVALID;
+ request->alpha2[0] =3D current_regdomain->alpha2[0];
+ request->alpha2[1] =3D current_regdomain->alpha2[1];
+ request->initiator =3D NL80211_USER_REG_HINT_USER;
+ request->user_reg_hint_type =3D NL80211_USER_REG_HINT_USER;
+ request->reload =3D true;
+
+ queue_regulatory_request(request);
+
out:
release_firmware(fw);
return err;
@@ -2657,7 +2683,8 @@ reg_process_hint_user(struct regulatory_request
*user_request)
treatment =3D __reg_process_hint_user(user_request);
if (treatment =3D=3D REG_REQ_IGNORE ||
- treatment =3D=3D REG_REQ_ALREADY_SET)
+ treatment =3D=3D REG_REQ_ALREADY_SET &&
+ !user_request->reload)
return REG_REQ_IGNORE;
user_request->intersect =3D treatment =3D=3D REG_REQ_INTERSECT;

--=20
2.29.2