summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCody Schuffelen <schuffelen@google.com>2019-02-06 15:54:15 -0800
committerAlistair Strachan <astrachan@google.com>2019-03-30 17:58:52 -0700
commit643dbe00f4800bf24b731f77bb673245b5b4b360 (patch)
tree60d86ccd098fb4645a927eed8be7980ecb8c1602
parent1c25c9cc4ab7b3728b6c7c9e7d44bc87d1e8571a (diff)
UPSTREAM: virt_wifi: Remove REGULATORY_WIPHY_SELF_MANAGED
REGULATORY_WIPHY_SELF_MANAGED as set here breaks NL80211_CMD_GET_REG, because it expects the wiphy to do regulatory management. Since virt_wifi does not do regulatory management, this triggers a WARN_ON in NL80211_CMD_GET_REG and fails the netlink command. Removing REGULATORY_WIPHY_SELF_MANAGED fixes the problem and the virtual wireless network continues to work. Signed-off-by: Cody Schuffelen <schuffelen@google.com> Acked-by: Alistair Strachan <astrachan@google.com> Acked-by: Greg Hartman <ghartman@google.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> (cherry picked from commit f440b125450dfc65ce0386eb231da2f663c45ca0) Bug: 119771992 Change-Id: Ida660b77a2f091e7aaabcecf8a60e66cc2f1f91d Signed-off-by: Alistair Strachan <astrachan@google.com>
-rw-r--r--drivers/net/wireless/virt_wifi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/virt_wifi.c b/drivers/net/wireless/virt_wifi.c
index 9c303f482aa9..7b7d4270ffc7 100644
--- a/drivers/net/wireless/virt_wifi.c
+++ b/drivers/net/wireless/virt_wifi.c
@@ -363,7 +363,6 @@ static struct wiphy *virt_wifi_make_wiphy(void)
wiphy->bands[IEEE80211_BAND_5GHZ] = &band_5ghz;
wiphy->bands[IEEE80211_BAND_60GHZ] = NULL;
- wiphy->regulatory_flags = REGULATORY_WIPHY_SELF_MANAGED;
wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
priv = wiphy_priv(wiphy);