Skip to content

Commit 37d3311

Browse files
kloenkjmberg-intel
authored andcommitted
nl80211: remove reload flag from regulatory_request
This removes the previously unused reload flag, which was introduced in 1eda919. 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: 1eda919 ("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>
1 parent 1fe98f5 commit 37d3311

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

include/net/regulatory.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ struct regulatory_request {
8383
enum nl80211_dfs_regions dfs_region;
8484
bool intersect;
8585
bool processed;
86-
bool reload;
8786
enum environment_cap country_ie_env;
8887
struct list_head list;
8988
};

net/wireless/reg.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,9 +1134,8 @@ int reg_reload_regdb(void)
11341134
request->wiphy_idx = WIPHY_IDX_INVALID;
11351135
request->alpha2[0] = current_regdomain->alpha2[0];
11361136
request->alpha2[1] = current_regdomain->alpha2[1];
1137-
request->initiator = NL80211_USER_REG_HINT_USER;
1137+
request->initiator = NL80211_REGDOM_SET_BY_CORE;
11381138
request->user_reg_hint_type = NL80211_USER_REG_HINT_USER;
1139-
request->reload = true;
11401139

11411140
reg_process_hint(request);
11421141

@@ -2712,8 +2711,7 @@ reg_process_hint_user(struct regulatory_request *user_request)
27122711

27132712
treatment = __reg_process_hint_user(user_request);
27142713
if (treatment == REG_REQ_IGNORE ||
2715-
(treatment == REG_REQ_ALREADY_SET &&
2716-
!user_request->reload))
2714+
treatment == REG_REQ_ALREADY_SET)
27172715
return REG_REQ_IGNORE;
27182716

27192717
user_request->intersect = treatment == REG_REQ_INTERSECT;

0 commit comments

Comments
 (0)