Release 4.0.10.51 QCACLD WLAN Driver

Merge remote-tracking branch 'origin/caf/caf-wlan/master'

* origin/caf/caf-wlan/master:
  Cafstaging Release 4.0.10.51
  qcacld: Fix VHT80 config for ACS

Change-Id: Iac8bd6334a7495016dfde7b706724c7e4eddc167

4 files changed, 21 insertions, 14 deletions

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index d01d79b6214f..fecef72ca562 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -4566,7 +4566,7 @@ static int wlan_hdd_config_acs(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter)
      sap_config->apStartChannelNum = ini_config->apStartChannelNum;
      sap_config->apEndChannelNum = ini_config->apEndChannelNum;
 #endif
-
+     sap_config->vht_channel_width = ini_config->vhtChannelWidth;
 #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE
     hddLog(LOG1, FL("HDD_ACS_SKIP_STATUS = %d"), hdd_ctx->skip_acs_scan_status);
 
@@ -4763,6 +4763,8 @@ static int wlan_hdd_cfg80211_start_acs(hdd_adapter_t *adapter)
 		}
 	}
 #endif
+	hddLog(LOG1, FL("ACS CFG: HW_MODE: %d ACS_BW: %d"),
+			sap_config->acs_hw_mode, sap_config->acs_ch_width);
 
 	vos_mem_zero(&smeConfig, sizeof(smeConfig));
 	sme_GetConfigParam(hdd_ctx->hHal, &smeConfig);
@@ -4869,7 +4871,6 @@ static int wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 	struct net_device *ndev = wdev->netdev;
 	hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(ndev);
 	hdd_context_t *hdd_ctx = wiphy_priv(wiphy);
-	tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter);
 	tsap_Config_t *sap_config;
 	struct sk_buff *temp_skbuff;
 	int status;
@@ -4944,13 +4945,6 @@ static int wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 				hdd_config->apEndChannelNum =
 					rfChannels[RF_CHAN_14].channelNum;
 #endif
-				if (hw_mode == QCA_ACS_MODE_IEEE80211G)
-					sme_SetPhyMode(hHal,
-						eCSR_DOT11_MODE_11g);
-				else
-					sme_SetPhyMode(hHal,
-						eCSR_DOT11_MODE_11b);
-
 				break;
 			case  QCA_ACS_MODE_IEEE80211A:
 #ifdef WLAN_FEATURE_MBSSID
@@ -4968,7 +4962,6 @@ static int wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 				hdd_config->sap_dyn_ini_cfg.apEndChannelNum =
 					rfChannels[RF_CHAN_165].channelNum;
 #endif
-				sme_SetPhyMode(hHal, eCSR_DOT11_MODE_11a);
 				break;
 			default:
 				hddLog(LOGE,
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
index 7e36601631f5..2151a000f72b 100644
--- a/CORE/MAC/inc/qwlan_version.h
+++ b/CORE/MAC/inc/qwlan_version.h
@@ -42,9 +42,9 @@ BRIEF DESCRIPTION:
 #define QWLAN_VERSION_MINOR            0
 #define QWLAN_VERSION_PATCH            10
 #define QWLAN_VERSION_EXTRA            ""
-#define QWLAN_VERSION_BUILD            50 
+#define QWLAN_VERSION_BUILD            51 
 
-#define QWLAN_VERSIONSTR               "4.0.10.50"
+#define QWLAN_VERSIONSTR               "4.0.10.51"
 
 
 #define AR6320_REV1_VERSION             0x5000000
diff --git a/CORE/SAP/src/sapApiLinkCntl.c b/CORE/SAP/src/sapApiLinkCntl.c
index 8d69d74d16f9..c6317d8a6783 100644
--- a/CORE/SAP/src/sapApiLinkCntl.c
+++ b/CORE/SAP/src/sapApiLinkCntl.c
@@ -420,9 +420,14 @@ WLANSAP_PreStartBssAcsScanCallback
                          psapContext->channel,
                          &psapContext->vht_channel_width);
 
-        /* determine secondary channel for 11n mode */
+        /* determine secondary channel for 11n / 11ac mode */
         if ((eCSR_DOT11_MODE_11n == psapContext->csrRoamProfile.phyMode) ||
-            (eCSR_DOT11_MODE_11n_ONLY == psapContext->csrRoamProfile.phyMode)) {
+            (eCSR_DOT11_MODE_11n_ONLY == psapContext->csrRoamProfile.phyMode)
+#ifdef WLAN_FEATURE_11AC
+            || (eCSR_DOT11_MODE_11ac == psapContext->csrRoamProfile.phyMode) ||
+            (eCSR_DOT11_MODE_11ac_ONLY == psapContext->csrRoamProfile.phyMode)
+#endif
+            ) {
             ePhyChanBondState cbMode;
 
             if (psapContext->channel > 14)
@@ -432,9 +437,17 @@ WLANSAP_PreStartBssAcsScanCallback
 
             switch (cbMode) {
             case PHY_DOUBLE_CHANNEL_LOW_PRIMARY:
+#ifdef WLAN_FEATURE_11AC
+            case PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW:
+            case PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH:
+#endif
                 psapContext->secondary_ch = psapContext->channel + 4;
                 break;
             case PHY_DOUBLE_CHANNEL_HIGH_PRIMARY:
+#ifdef WLAN_FEATURE_11AC
+            case PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW:
+            case PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH:
+#endif
                 psapContext->secondary_ch = psapContext->channel - 4;
                 break;
             case PHY_SINGLE_CHANNEL_CENTERED:
diff --git a/CORE/SAP/src/sapModule.c b/CORE/SAP/src/sapModule.c
index 973a96573843..80c994f1be1b 100644
--- a/CORE/SAP/src/sapModule.c
+++ b/CORE/SAP/src/sapModule.c
@@ -706,6 +706,7 @@ WLANSAP_SetScanAcsChannelParams(tsap_Config_t *pConfig,
     pSapCtx->apAutoChannelSelection = VOS_TRUE;
     pSapCtx->apStartChannelNum = pConfig->apStartChannelNum;
     pSapCtx->apEndChannelNum = pConfig->apEndChannelNum;
+    pSapCtx->vht_channel_width = pConfig->vht_channel_width;
 #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE
     pSapCtx->skip_acs_scan_status = pConfig->skip_acs_scan_status;
     pSapCtx->skip_acs_scan_range1_endch = pConfig->skip_acs_scan_range1_endch;