openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

UPSTREAM: 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>

Bug: 215824523
(cherry picked from commit 37d33114240ede043c42463a6347f68ed72d6904)
Change-Id: I26ea2e65f8e853dc8133e56296710aeb4a1c8c01
Signed-off-by: Veerendranath Jakkam <quic_vjakkam@quicinc.com>
This commit is contained in:
Finn Behrens 2021-12-01 13:49:18 +01:00 committed by Todd Kjos
parent f3a39c4218
commit 92d558f329
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/regulatory.h
View File

@ -83,7 +83,6 @@ 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;
};

6
net/wireless/reg.c
View File

@ -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);
@ -2717,8 +2716,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;