|
|
@@ -2661,11 +2661,12 @@ static void reg_process_hint(struct regulatory_request *reg_request)
|
|
|
{
|
|
|
struct wiphy *wiphy = NULL;
|
|
|
enum reg_request_treatment treatment;
|
|
|
+ enum nl80211_reg_initiator initiator = reg_request->initiator;
|
|
|
|
|
|
if (reg_request->wiphy_idx != WIPHY_IDX_INVALID)
|
|
|
wiphy = wiphy_idx_to_wiphy(reg_request->wiphy_idx);
|
|
|
|
|
|
- switch (reg_request->initiator) {
|
|
|
+ switch (initiator) {
|
|
|
case NL80211_REGDOM_SET_BY_CORE:
|
|
|
treatment = reg_process_hint_core(reg_request);
|
|
|
break;
|
|
|
@@ -2683,7 +2684,7 @@ static void reg_process_hint(struct regulatory_request *reg_request)
|
|
|
treatment = reg_process_hint_country_ie(wiphy, reg_request);
|
|
|
break;
|
|
|
default:
|
|
|
- WARN(1, "invalid initiator %d\n", reg_request->initiator);
|
|
|
+ WARN(1, "invalid initiator %d\n", initiator);
|
|
|
goto out_free;
|
|
|
}
|
|
|
|
|
|
@@ -2698,7 +2699,7 @@ static void reg_process_hint(struct regulatory_request *reg_request)
|
|
|
*/
|
|
|
if (treatment == REG_REQ_ALREADY_SET && wiphy &&
|
|
|
wiphy->regulatory_flags & REGULATORY_STRICT_REG) {
|
|
|
- wiphy_update_regulatory(wiphy, reg_request->initiator);
|
|
|
+ wiphy_update_regulatory(wiphy, initiator);
|
|
|
wiphy_all_share_dfs_chan_state(wiphy);
|
|
|
reg_check_channels();
|
|
|
}
|