commit 0d6dd75493cdb680f20e09c6ade81fe2bbd259c4
author Rajeev Kumar Sirasanagandla <rsirasan@qti.qualcomm.com> Wed Aug 17 15:01:39 2016 +0530
committer Satyanarayana Dash <sadash@codeaurora.org> Mon Aug 22 18:37:52 2016 +0530
tree a69dd3d971adfe359d9cb5a4ceb9bcb39463f068
parent 58518d44ad8b6933c3f049b8ed67c721f7bcac2b

wlan: Fix overwrite of regulatory flags

In current implementation, REGULATORY_DISABLE_BEACON_HINTS is set but
overwritten with the REGULATORY_COUNTRY_IE_IGNORE, beacuse of which
passive scan flags and beaconing flags are lifted by cfg80211 due to
regulatory beacon hints.

This fix this, set both flags and avoid overwrite.

Change-Id: I8bc4f0c0275b9035414bdcdafa692bf1102a77cf
CRs-Fixed: 1054854

CORE/HDD/src/wlan_hdd_cfg80211.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index da718ce..895fb56 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -7919,7 +7919,7 @@
                  |  WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL
                     | WIPHY_FLAG_OFFCHAN_TX;
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
-    wiphy->regulatory_flags = REGULATORY_COUNTRY_IE_IGNORE;
+    wiphy->regulatory_flags |= REGULATORY_COUNTRY_IE_IGNORE;
 #else
      wiphy->country_ie_pref = NL80211_COUNTRY_IE_IGNORE_CORE;
 #endif