diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-07 00:43:42 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-07 00:43:42 +0300 |
| commit | 72438f8cef4e75a22140853baa4c68392c721b22 (patch) | |
| tree | 78b7b6dafd827e0d55150a227db3978d91c0b6dd /net/wireless/reg.c | |
| parent | fb4ee67529ff3e4c5874768477887c2df5714c96 (diff) | |
| parent | c1d84a1b42ef70d8ae601df9cadedc7ed4f1beb1 (diff) | |
| download | linux-72438f8cef4e75a22140853baa4c68392c721b22.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 5ad5b9f98e8f..148c229fe84f 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2667,11 +2667,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; @@ -2689,7 +2690,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; } @@ -2704,7 +2705,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(); } |