wlan: Fix to advertise HT40 capabilities only when allowed
qcacld 2.0 to pronto propagation
Currently SAP advertises HT40 capabilities for country code ID and
CR in 2.4GHZ. ID and CR allows only HT20 in 2.4GHz.
This change set fix the issue by validating the 40MHz channel against
the regulatory domain and advertise HT40 capabilities only if allowed.
Change-Id: Id90b68d35c30371de3fdf43ecd5e4e1a1b1fb0bf
CRs-Fixed: 766085
diff --git a/CORE/SME/inc/smeInside.h b/CORE/SME/inc/smeInside.h
index c86dbf1..cf97d96 100644
--- a/CORE/SME/inc/smeInside.h
+++ b/CORE/SME/inc/smeInside.h
@@ -68,7 +68,7 @@
------------------------------------------------------------------------*/
#define SME_TOTAL_COMMAND 30
-
+#define SME_START_CHAN_STEP 4
typedef struct sGenericPmcCmd
{
@@ -230,7 +230,8 @@
//the command, if applicable.
void pmcAbortCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand, tANI_BOOLEAN fStopping );
tANI_BOOLEAN qosProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand );
-
+eHalStatus csrIsValidChannel(tpAniSirGlobal pMac, tANI_U8 chnNum);
+tANI_BOOLEAN csrRoamIsValid40MhzChannel(tpAniSirGlobal pMac, tANI_U8 channel);
eHalStatus csrProcessScanCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand );
eHalStatus csrRoamProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand );
void csrRoamProcessWmStatusChangeCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand );
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index a8fafc0..13074a9 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -10988,6 +10988,154 @@
}
/*
+ * SME API to adjust bonding mode to regulatory .. etc.
+ *
+ */
+static VOS_STATUS sme_AdjustCBMode(tAniSirGlobal* pMac,
+ tSmeConfigParams *smeConfig,
+ tANI_U8 channel)
+{
+ const tANI_U8 step = SME_START_CHAN_STEP;
+ tANI_U8 i, startChan = channel, chanCnt = 0, chanBitmap = 0;
+ tANI_BOOLEAN violation = VOS_FALSE;
+ tANI_U32 newMode, mode;
+ tANI_U8 centerChan = channel;
+ /* to validate 40MHz channels against the regulatory domain */
+ tANI_BOOLEAN ht40PhyMode = VOS_FALSE;
+
+ /* get the bonding mode */
+ mode = (channel <= 14) ? smeConfig->csrConfig.channelBondingMode24GHz :
+ smeConfig->csrConfig.channelBondingMode5GHz;
+ newMode = mode;
+
+ /* get the channels */
+ switch (mode)
+ {
+ case eCSR_INI_SINGLE_CHANNEL_CENTERED:
+ startChan = channel;
+ chanCnt = 1;
+ break;
+ case eCSR_INI_DOUBLE_CHANNEL_HIGH_PRIMARY:
+ startChan = channel - step;
+ chanCnt = 2;
+ centerChan = channel - CSR_CB_CENTER_CHANNEL_OFFSET;
+ ht40PhyMode = VOS_TRUE;
+ break;
+ case eCSR_INI_DOUBLE_CHANNEL_LOW_PRIMARY:
+ startChan = channel;
+ chanCnt=2;
+ centerChan = channel + CSR_CB_CENTER_CHANNEL_OFFSET;
+ ht40PhyMode = VOS_TRUE;
+ break;
+#ifdef WLAN_FEATURE_11AC
+ case eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW:
+ startChan = channel;
+ chanCnt = 4;
+ break;
+ case eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW:
+ startChan = channel - step;
+ chanCnt = 4;
+ break;
+ case eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH:
+ startChan = channel - 2*step;
+ chanCnt = 4;
+ break;
+ case eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH:
+ startChan = channel - 3*step;
+ chanCnt = 4;
+ break;
+#endif
+ default:
+ VOS_ASSERT(0);
+ return VOS_STATUS_E_FAILURE;
+ }
+
+ /* find violation; also map valid channels to a bitmap */
+ for (i = 0; i < chanCnt; i++)
+ {
+ if (csrIsValidChannel(pMac, (startChan + (i * step))) ==
+ eHAL_STATUS_SUCCESS)
+ chanBitmap = chanBitmap | 1 << i;
+ else
+ violation = VOS_TRUE;
+ }
+ /* validate if 40MHz channel is allowed */
+ if (ht40PhyMode)
+ {
+ if (!csrRoamIsValid40MhzChannel(pMac, centerChan))
+ violation = VOS_TRUE;
+ }
+
+ /* no channels are valid */
+ if (chanBitmap == 0)
+ {
+ /* never be in this case */
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ FL("channel %d %s is not supported"),
+ channel,
+ sme_CBMode2String(mode));
+ return VOS_STATUS_E_INVAL;
+ }
+
+ /* fix violation */
+ if (violation)
+ {
+ const tANI_U8 lowerMask = 0x03, upperMask = 0x0c;
+ /* fall back to single channel in all exception cases */
+ newMode = eCSR_INI_SINGLE_CHANNEL_CENTERED;
+
+ switch (mode)
+ {
+ case eCSR_INI_SINGLE_CHANNEL_CENTERED:
+ /* fall thru */
+ case eCSR_INI_DOUBLE_CHANNEL_HIGH_PRIMARY:
+ /* fall thru */
+ case eCSR_INI_DOUBLE_CHANNEL_LOW_PRIMARY:
+ break;
+#ifdef WLAN_FEATURE_11AC
+ case eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW:
+ if ((chanBitmap & lowerMask) == lowerMask)
+ newMode = eCSR_INI_DOUBLE_CHANNEL_LOW_PRIMARY;
+ break;
+ case eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW:
+ if ((chanBitmap & lowerMask) == lowerMask)
+ newMode = eCSR_INI_DOUBLE_CHANNEL_HIGH_PRIMARY;
+ break;
+ case eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH:
+ if ((chanBitmap & upperMask) == upperMask)
+ newMode = eCSR_INI_DOUBLE_CHANNEL_LOW_PRIMARY;
+ break;
+ case eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH:
+ if ((chanBitmap & upperMask) == upperMask)
+ newMode = eCSR_INI_DOUBLE_CHANNEL_HIGH_PRIMARY;
+ break;
+#endif
+ default:
+ return VOS_STATUS_E_NOSUPPORT;
+ break;
+ }
+
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
+ FL("bonding mode adjust: %s to %s"),
+ sme_CBMode2String(mode),
+ sme_CBMode2String(newMode));
+
+ }
+
+ /* check for mode change */
+ if (newMode != mode)
+ {
+ if (channel <= 14)
+ smeConfig->csrConfig.channelBondingMode24GHz = newMode;
+ else
+ smeConfig->csrConfig.channelBondingMode5GHz = newMode;
+ }
+
+ return VOS_STATUS_SUCCESS;
+
+}
+
+/*
* SME API to determine the channel bonding mode
*/
VOS_STATUS sme_SelectCBMode(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, tANI_U8 channel)
@@ -11137,6 +11285,8 @@
}
#endif
+ sme_AdjustCBMode(pMac, &smeConfig, channel);
+
#ifdef WLAN_FEATURE_AP_HT40_24G
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
FL("%s cbmode selected=%d bonding mode:%s"),