wlan: use correct regulatory APIs
use regulatory_hint_user() API when
the hint comes from the country IE or
userspace
CRs-Fixed: 564372
Change-Id: I4dd7f77ca572e4ce66377ca9c0b038328a419289
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 8fdcac7..f1be3ff 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -639,12 +639,11 @@
wiphy->mgmt_stypes = wlan_hdd_txrx_stypes;
- #ifndef CONFIG_ENABLE_LINUX_REG
+#ifndef CONFIG_ENABLE_LINUX_REG
/* the flag for the other case would be initialzed in
vos_init_wiphy_from_nv_bin */
-
wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
- #endif
+#endif
/* This will disable updating of NL channels from passive to
* active if a beacon is received on passive channel. */
@@ -657,6 +656,7 @@
| WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD
| WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL
| WIPHY_FLAG_OFFCHAN_TX;
+ wiphy->country_ie_pref = NL80211_COUNTRY_IE_IGNORE_CORE;
#endif
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)