Commit 37d33114 authored by Finn Behrens's avatar Finn Behrens Committed by Johannes Berg
Browse files

nl80211: remove reload flag from regulatory_request 



This removes the previously unused reload flag, which was introduced in
1eda9191.
The request is handled as NL80211_REGDOM_SET_BY_CORE, which is parsed
unconditionally.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Reported-by: default avatarNathan Chancellor <nathan@kernel.org>
Fixes: 1eda9191 ("nl80211: reset regdom when reloading regdb")
Link: https://lore.kernel.org/all/YaZuKYM5bfWe2Urn@archlinux-ax161/


Signed-off-by: default avatarFinn Behrens <me@kloenk.de>
Reviewed-by: default avatarNathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/YadvTolO8rQcNCd/@gimli.kloenk.dev


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1fe98f56

include/net/regulatory.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

};

net/wireless/reg.c

+2 −4
Original line number Diff line number Diff line
@@ -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;