wlan: Broadcast 11AC capabilities though HW don't support 11AC.
P2P Go broadcasting 11AC capabilities though hardware doesn't
support 11AC. This is because, during BSS start dot11mode is
being set to 11AC irrespective of 11AC mode is supported by
host and firmware.
To fix this set dot11mode to 11AC only if 11AC capability
is supported by both host and firmware.
Change-Id: I3b51e777bc80398439dd59ba8fff0ec87b1a5929
CRs-Fixed: 576700
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index c80eddd..a4eef99 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -2039,13 +2039,16 @@
#ifdef WLAN_FEATURE_11AC
/* Overwrite the hostapd setting for HW mode only for 11ac.
- * This is valid only if mode is set to 11n in hostapd and either AUTO or 11ac in .ini .
- * Otherwise, leave whatever is set in hostapd (a OR b OR g OR n mode) */
+ * This is valid only if mode is set to 11n in hostapd, either AUTO or
+ * 11ac in .ini and 11ac is supported by both host and firmware.
+ * Otherwise, leave whatever is set in hostapd (a OR b OR g OR n mode)
+ */
if( ((pConfig->SapHw_mode == eSAP_DOT11_MODE_11n) ||
(pConfig->SapHw_mode == eSAP_DOT11_MODE_11n_ONLY)) &&
(((WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->dot11Mode == eHDD_DOT11_MODE_AUTO) ||
((WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->dot11Mode == eHDD_DOT11_MODE_11ac) ||
- ((WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->dot11Mode == eHDD_DOT11_MODE_11ac_ONLY)) )
+ ((WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->dot11Mode == eHDD_DOT11_MODE_11ac_ONLY)) &&
+ (sme_IsFeatureSupportedByDriver(DOT11AC)) && (sme_IsFeatureSupportedByFW(DOT11AC)) )
{
pConfig->SapHw_mode = eSAP_DOT11_MODE_11ac;