summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorFinn Behrens <me@kloenk.de>2021-12-01 15:49:18 +0300
committerJohannes Berg <johannes.berg@intel.com>2021-12-14 13:18:46 +0300
commit37d33114240ede043c42463a6347f68ed72d6904 (patch)
tree20906a095f5763429f2e2332fe5946d587d95cb0 /net
parent1fe98f5690c4219d419ea9cc190f94b3401cf324 (diff)
downloadlinux-37d33114240ede043c42463a6347f68ed72d6904.tar.xz
nl80211: remove reload flag from regulatory_request
This removes the previously unused reload flag, which was introduced in 1eda919126b4. The request is handled as NL80211_REGDOM_SET_BY_CORE, which is parsed unconditionally. Reported-by: kernel test robot <lkp@intel.com> Reported-by: Nathan Chancellor <nathan@kernel.org> Fixes: 1eda919126b4 ("nl80211: reset regdom when reloading regdb") Link: https://lore.kernel.org/all/YaZuKYM5bfWe2Urn@archlinux-ax161/ Signed-off-by: Finn Behrens <me@kloenk.de> Reviewed-by: Nathan Chancellor <nathan@kernel.org> Link: https://lore.kernel.org/r/YadvTolO8rQcNCd/@gimli.kloenk.dev Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/reg.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 61f1bf1bc4a7..8148a3b5f607 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1134,9 +1134,8 @@ int reg_reload_regdb(void)
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->initiator = NL80211_REGDOM_SET_BY_CORE;
request->user_reg_hint_type = NL80211_USER_REG_HINT_USER;
- request->reload = true;
reg_process_hint(request);
@@ -2712,8 +2711,7 @@ 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 &&
- !user_request->reload))
+ treatment == REG_REQ_ALREADY_SET)
return REG_REQ_IGNORE;
user_request->intersect = treatment == REG_REQ_INTERSECT;