nl80211: remove reload flag from regulatory_request

This removes the previously unused reload flag, which was introduced in
62d7d57f18df.
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: 62d7d57f18df ("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>

diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 0cf9335431e0702cd70a223842d306300b887109..47f06f6f5a67cca76a30d37458ec43ca3ee0efe4 100644 (file)
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -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;
 };

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 61f1bf1bc4a73aade27637887e9cad2c19138d58..8148a3b5f6071c193c2763efd1d9aba5dfae33c5 100644 (file)
--- 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;