wlan:If channel bonding is disabled dont update the channel opermode.
Even if channel bonding is disabled in INI after connection, when
host receive the beacon from AP with channel width greater than
20Mhz, an update is sent to firmware with channel bonding mode
value as received in beacon.
Added a check that if channel bonding mode is disabled, ignore the
channel width in beacon. Also ignore the vht opmode change action
frame if channel bonding is disabled.
Change-Id: Ia4d0f98eda0bf7b016577eaea58260bb3a5b5754
CRs-Fixed: 756269
diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
index ac6a089..733dff5 100644
--- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
@@ -387,13 +387,34 @@
tANI_U32 nStatus;
tpDphHashNode pSta;
tANI_U16 aid;
- tANI_U8 operMode;
+ tANI_U8 operMode;
+ tANI_U32 channelBondingMode;
pHdr = WDA_GET_RX_MAC_HEADER(pRxPacketInfo);
pBody = WDA_GET_RX_MPDU_DATA(pRxPacketInfo);
frameLen = WDA_GET_RX_PAYLOAD_LEN(pRxPacketInfo);
- PELOG3(limLog(pMac, LOG3, FL("Received Operating Mode action frame"));)
+ limLog(pMac, LOG1, FL("Received Operating Mode action frame"));
+
+ if( RF_CHAN_14 >= psessionEntry->currentOperChannel )
+ {
+ channelBondingMode = pMac->roam.configParam.channelBondingMode24GHz;
+ }
+ else
+ {
+ channelBondingMode = pMac->roam.configParam.channelBondingMode5GHz;
+ }
+
+ /* Do not update the channel bonding mode if channel bonding
+ * mode is disabled in INI.
+ */
+ if(WNI_CFG_CHANNEL_BONDING_MODE_DISABLE == channelBondingMode)
+ {
+ limLog(pMac, LOGW,
+ FL("channel bonding disabled"));
+ return;
+ }
+
pOperatingModeframe = vos_mem_malloc(sizeof(*pOperatingModeframe));
if (NULL == pOperatingModeframe)
{