aboutsummaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorAndrei Otcheretianski <andrei.otcheretianski@intel.com>2018-09-05 08:06:12 +0300
committerMoyster <oysterized@gmail.com>2019-05-03 19:24:03 +0200
commitd1b5e22588c61060bf83d19bf886e4b57212630a (patch)
tree79a1f2f0a93406c50a8384f0f1859276d093b0b1 /net/wireless
parent0354299fb1090439092e72a4e3de3e07358c4624 (diff)
cfg80211: reg: Init wiphy_idx in regulatory_hint_core()
commit 24f33e64fcd0d50a4b1a8e5b41bd0257aa66b0e8 upstream. Core regulatory hints didn't set wiphy_idx to WIPHY_IDX_INVALID. Since the regulatory request is zeroed, wiphy_idx was always implicitly set to 0. This resulted in updating only phy #0. Fix that. Fixes: 806a9e39670b ("cfg80211: make regulatory_request use wiphy_idx instead of wiphy") Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> [add fixes tag] Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Change-Id: If98e015f5778873df7f29cf4bc67cd2ae5c4bc27
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/reg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index cc35fbaa4..2573f2f45 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1663,6 +1663,7 @@ static int regulatory_hint_core(const char *alpha2)
request->alpha2[0] = alpha2[0];
request->alpha2[1] = alpha2[1];
request->initiator = NL80211_REGDOM_SET_BY_CORE;
+ request->wiphy_idx = WIPHY_IDX_INVALID;
queue_regulatory_request(request);