commit 634aba32f088e89def345aa312082abca990b5b5
author krunal soni <ksoni@qca.qualcomm.com> Thu Mar 06 17:46:50 2014 -0800
committer Kiet Lam <c_kietl@qca.qualcomm.com> Thu Mar 13 16:12:31 2014 -0700
tree 20679c4aed94404193a5307a2c9cf0aa64cc7cb9
parent 9146591d41491d5da316a2d12c9c0d34ce5d713d

wlan: Fix for setting channel bond as zero for 802.11a

We were setting channel bonding mode as non-zero for 802.11a
which is technically incorrect.

Change-Id: I814d7bd877149d6341e7376ad97f51cf1ff62c21
CRs-Fixed: 624623

CORE/SME/src/sme_common/sme_Api.c

diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 4f7508f..918b04c 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -9883,7 +9883,12 @@
          eCSR_DOT11_MODE_11ac_ONLY != eCsrPhyMode &&
 #endif
          eCSR_DOT11_MODE_11n != eCsrPhyMode &&
-         eCSR_DOT11_MODE_11n_ONLY != eCsrPhyMode
+         eCSR_DOT11_MODE_11n_ONLY != eCsrPhyMode &&
+
+         eCSR_DOT11_MODE_11a != eCsrPhyMode &&
+         eCSR_DOT11_MODE_11a_ONLY != eCsrPhyMode &&
+
+         eCSR_DOT11_MODE_abg != eCsrPhyMode
       )
    {
       return VOS_STATUS_SUCCESS;
@@ -9954,6 +9959,20 @@
          smeConfig.csrConfig.channelBondingMode5GHz = 0;
       }
    }
+
+   /*
+      for 802.11a phy mode, channel bonding should be zero.
+      From default config, it is set as PHY_DOUBLE_CHANNEL_HIGH_PRIMARY = 3
+      through csrChangeDefaultConfigParam function. We will override this
+      value here.
+   */
+   if (  eCSR_DOT11_MODE_11a == eCsrPhyMode ||
+         eCSR_DOT11_MODE_11a_ONLY == eCsrPhyMode ||
+         eCSR_DOT11_MODE_abg == eCsrPhyMode)
+   {
+      smeConfig.csrConfig.channelBondingMode5GHz = 0;
+   }
+
    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
          "cbmode selected=%d", smeConfig.csrConfig.channelBondingMode5GHz);