wlan: Remove hard tabs from WLAN driver
Hard tabs are forbidden by the QCT Coding Standard, so remove/replace
hard tabs which have been added to the code.
Change-Id: I12d3a095882d98a1cf480df1e6fff2ce3dca1009
CR-Fixed: NA
diff --git a/CORE/DXE/src/wlan_qct_dxe.c b/CORE/DXE/src/wlan_qct_dxe.c
index 6750bbc..00ec0d4 100644
--- a/CORE/DXE/src/wlan_qct_dxe.c
+++ b/CORE/DXE/src/wlan_qct_dxe.c
@@ -3174,7 +3174,7 @@
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"dxeTXEventHandler IMPS HC COMP interrupt fail");
}
-
+
status = dxeTXCompFrame(dxeCtxt, &dxeCtxt->dxeChannel[WDTS_CHANNEL_TX_LOW_PRI]);
if(eWLAN_PAL_STATUS_SUCCESS != status)
{
diff --git a/CORE/HDD/inc/wlan_hdd_assoc.h b/CORE/HDD/inc/wlan_hdd_assoc.h
index f3945f6..e92b2c4 100644
--- a/CORE/HDD/inc/wlan_hdd_assoc.h
+++ b/CORE/HDD/inc/wlan_hdd_assoc.h
@@ -43,7 +43,7 @@
/** Disconnecting in an Infrastructure network.*/
eConnectionState_Disconnecting
-
+
}eConnectionState;
/**This structure stores the connection information */
typedef struct connection_info_s
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 02afe0f..f6a1e8c 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -1607,17 +1607,17 @@
struct net_device *dev = pAdapter->dev;
netif_tx_disable(dev);
/*
- * Deregister for this STA with TL with the objective to flush
- * all the packets for this STA from wmm_tx_queue. If not done here,
- * we would run into a race condition (CR390567) wherein TX
- * thread would schedule packets from wmm_tx_queue AFTER peer STA has
- * been deleted. And, these packets get assigned with a STA idx of
- * self-sta (since the peer STA has been deleted) and get transmitted
- * on the new channel before the reassoc request. Since there will be
- * no ACK on the new channel, each packet gets retransmitted which
- * takes several seconds before the transmission of reassoc request.
- * This leads to reassoc-timeout and roam failure.
- */
+ * Deregister for this STA with TL with the objective to flush
+ * all the packets for this STA from wmm_tx_queue. If not done here,
+ * we would run into a race condition (CR390567) wherein TX
+ * thread would schedule packets from wmm_tx_queue AFTER peer STA has
+ * been deleted. And, these packets get assigned with a STA idx of
+ * self-sta (since the peer STA has been deleted) and get transmitted
+ * on the new channel before the reassoc request. Since there will be
+ * no ACK on the new channel, each packet gets retransmitted which
+ * takes several seconds before the transmission of reassoc request.
+ * This leads to reassoc-timeout and roam failure.
+ */
status = hdd_roamDeregisterSTA( pAdapter, pHddStaCtx->conn_info.staId [0] );
if ( !VOS_IS_STATUS_SUCCESS(status ) )
{
@@ -1625,7 +1625,7 @@
FL("hdd_roamDeregisterSTA() failed to for staID %d. Status= %d [0x%x]"),
pHddStaCtx->conn_info.staId[0], status, status );
halStatus = eHAL_STATUS_FAILURE;
- }
+ }
}
pHddStaCtx->ft_carrier_on = TRUE;
break;
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 6d1a520..59ffa97 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -1302,15 +1302,14 @@
return -EINVAL;
}
}
- /*
- *Validate the given channel range for
- * for given country code
- */
- else
- {
- hdd_config_t *hdd_pConfig= (WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini;
- WLANSAP_SetChannelRange(hHal,hdd_pConfig->apStartChannelNum,hdd_pConfig->apEndChannelNum,hdd_pConfig->apOperatingBand);
- }
+ /*
+ * Validate the given channel range for the given country code
+ */
+ else
+ {
+ hdd_config_t *hdd_pConfig= (WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini;
+ WLANSAP_SetChannelRange(hHal,hdd_pConfig->apStartChannelNum,hdd_pConfig->apEndChannelNum,hdd_pConfig->apOperatingBand);
+ }
}
else
{
@@ -4438,25 +4437,25 @@
#endif
/* Appending HS 2.0 Indication Element in Assiciation Request */
else if ( (0 == memcmp(&genie[0], HS20_OUI_TYPE,
- HS20_OUI_TYPE_SIZE)) )
- {
- v_U16_t curAddIELen = pWextState->assocAddIE.length;
- hddLog (VOS_TRACE_LEVEL_INFO, "%s Set HS20 IE(len %d)",
- __func__, eLen + 2);
+ HS20_OUI_TYPE_SIZE)) )
+ {
+ v_U16_t curAddIELen = pWextState->assocAddIE.length;
+ hddLog (VOS_TRACE_LEVEL_INFO, "%s Set HS20 IE(len %d)",
+ __func__, eLen + 2);
- if( SIR_MAC_MAX_IE_LENGTH < (pWextState->assocAddIE.length + eLen) )
- {
- hddLog(VOS_TRACE_LEVEL_FATAL, "Cannot accomadate assocAddIE "
- "Need bigger buffer space\n");
- VOS_ASSERT(0);
- return -ENOMEM;
- }
- memcpy( pWextState->assocAddIE.addIEdata + curAddIELen, genie - 2, eLen + 2);
- pWextState->assocAddIE.length += eLen + 2;
+ if( SIR_MAC_MAX_IE_LENGTH < (pWextState->assocAddIE.length + eLen) )
+ {
+ hddLog(VOS_TRACE_LEVEL_FATAL, "Cannot accomadate assocAddIE "
+ "Need bigger buffer space\n");
+ VOS_ASSERT(0);
+ return -ENOMEM;
+ }
+ memcpy( pWextState->assocAddIE.addIEdata + curAddIELen, genie - 2, eLen + 2);
+ pWextState->assocAddIE.length += eLen + 2;
- pWextState->roamProfile.pAddIEAssoc = pWextState->assocAddIE.addIEdata;
- pWextState->roamProfile.nAddIEAssocLength = pWextState->assocAddIE.length;
- }
+ pWextState->roamProfile.pAddIEAssoc = pWextState->assocAddIE.addIEdata;
+ pWextState->roamProfile.nAddIEAssocLength = pWextState->assocAddIE.length;
+ }
break;
case DOT11F_EID_RSN:
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index f388cde..bc5d639 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -245,17 +245,17 @@
hdd_setP2pOpps(dev, command);
}
#endif
-
- /*
- command should be a string having format
- SET_SAP_CHANNEL_LIST <num of channels> <the channels seperated by spaces>
- */
+
+ /*
+ command should be a string having format
+ SET_SAP_CHANNEL_LIST <num of channels> <the channels seperated by spaces>
+ */
if(strncmp(command, "SET_SAP_CHANNEL_LIST", 20) == 0)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- " Received Command to Set Preferred Channels for SAP in %s", __FUNCTION__);
-
- ret = sapSetPreferredChannel(dev,command);
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ " Received Command to Set Preferred Channels for SAP in %s", __FUNCTION__);
+
+ ret = sapSetPreferredChannel(dev,command);
}
}
exit:
@@ -458,7 +458,7 @@
"eSAP_STATUS_FAILURE" : "eSAP_STATUS_SUCCESS");
//Free up Channel List incase if it is set
- sapCleanupChannelList();
+ sapCleanupChannelList();
pHddApCtx->operatingChannel = 0; //Invalidate the channel info.
vos_event_set(&pHostapdState->vosEvent);
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 9f6e6ba..0b62617 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -433,19 +433,19 @@
"%s: SME Change Country code fail ret=%d\n",__func__, ret);
}
- }
- /*
- command should be a string having format
- SET_SAP_CHANNEL_LIST <num of channels> <the channels seperated by spaces>
- */
+ }
+ /*
+ command should be a string having format
+ SET_SAP_CHANNEL_LIST <num of channels> <the channels seperated by spaces>
+ */
else if(strncmp(priv_data.buf, "SET_SAP_CHANNEL_LIST", 20) == 0)
- {
- tANI_U8 *ptr = (tANI_U8*)priv_data.buf;
-
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- " Received Command to Set Preferred Channels for SAP in %s", __FUNCTION__);
-
- ret = sapSetPreferredChannel(dev,ptr);
+ {
+ tANI_U8 *ptr = (tANI_U8*)priv_data.buf;
+
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ " Received Command to Set Preferred Channels for SAP in %s", __FUNCTION__);
+
+ ret = sapSetPreferredChannel(dev, ptr);
}
}
exit:
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 67b9ed8..d9ab900 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -390,7 +390,7 @@
tANI_U16 vhtRxMCSMap;
/*Indicate the highest VHT data rate that the STA is able to receive*/
tANI_U16 vhtRxHighestDataRate;
- /*Indicates the Maximum MCS that can be transmitted for each number
+ /*Indicates the Maximum MCS that can be transmitted for each number
of spacial streams */
tANI_U16 vhtTxMCSMap;
/*Indicate the highest VHT data rate that the STA is able to transmit*/
diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h
index badcc3e..5363f9f 100644
--- a/CORE/MAC/src/include/sirParams.h
+++ b/CORE/MAC/src/include/sirParams.h
@@ -69,8 +69,8 @@
#define SIR_MAX(a,b) (((a) > (b)) ? (a) : (b))
typedef enum {
- MCC = 0,
- P2P = 1,
+ MCC = 0,
+ P2P = 1,
DOT11AC = 2,
SLM_SESSIONIZATION = 3,
DOT11AC_OPMODE = 4,
diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
index 0bf2659..f9a99b3 100644
--- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
@@ -278,7 +278,7 @@
limLog( pMac, LOGE,
FL( "Failed to unpack and parse an 11h-CHANSW Request (0x%08x, %d bytes):\n"),
nStatus,
- frameLen);
+ frameLen);
palFreeMemory(pMac->hHdd, pChannelSwitchFrame);
return;
}
@@ -314,7 +314,7 @@
psessionEntry->gLimChannelSwitch.switchCount;
psessionEntry->gLimChannelSwitch.switchMode = pChannelSwitchFrame->ChanSwitchAnn.switchMode;
#ifdef WLAN_FEATURE_11AC
- if ( pChannelSwitchFrame->WiderBWChanSwitchAnn.present && psessionEntry->vhtCapability)
+ if ( pChannelSwitchFrame->WiderBWChanSwitchAnn.present && psessionEntry->vhtCapability)
{
psessionEntry->gLimWiderBWChannelSwitch.newChanWidth = pChannelSwitchFrame->WiderBWChanSwitchAnn.newChanWidth;
psessionEntry->gLimWiderBWChannelSwitch.newCenterChanFreq0 = pChannelSwitchFrame->WiderBWChanSwitchAnn.newCenterChanFreq0;
@@ -338,19 +338,20 @@
psessionEntry->gLimChannelSwitch.secondarySubBand = pChannelSwitchFrame->ExtChanSwitchAnn.secondaryChannelOffset;
}
#ifdef WLAN_FEATURE_11AC
- if(psessionEntry->vhtCapability && pChannelSwitchFrame->WiderBWChanSwitchAnn.present)
- {
+ if(psessionEntry->vhtCapability && pChannelSwitchFrame->WiderBWChanSwitchAnn.present)
+ {
if (pChannelSwitchFrame->WiderBWChanSwitchAnn.newChanWidth == WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ)
{
if (pChannelSwitchFrame->ExtChanSwitchAnn.present && ((pChannelSwitchFrame->ExtChanSwitchAnn.secondaryChannelOffset == PHY_DOUBLE_CHANNEL_LOW_PRIMARY) ||
(pChannelSwitchFrame->ExtChanSwitchAnn.secondaryChannelOffset == PHY_DOUBLE_CHANNEL_HIGH_PRIMARY)))
{
psessionEntry->gLimChannelSwitch.state = eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY;
- psessionEntry->gLimChannelSwitch.secondarySubBand = limGet11ACPhyCBState(pMac,
- psessionEntry->gLimChannelSwitch.primaryChannel,
- pChannelSwitchFrame->ExtChanSwitchAnn.secondaryChannelOffset,
- pChannelSwitchFrame->WiderBWChanSwitchAnn.newCenterChanFreq0,
- psessionEntry);
+ psessionEntry->gLimChannelSwitch.secondarySubBand =
+ limGet11ACPhyCBState(pMac,
+ psessionEntry->gLimChannelSwitch.primaryChannel,
+ pChannelSwitchFrame->ExtChanSwitchAnn.secondaryChannelOffset,
+ pChannelSwitchFrame->WiderBWChanSwitchAnn.newCenterChanFreq0,
+ psessionEntry);
}
}
}
@@ -438,7 +439,7 @@
pHdr->sa[3],
pHdr->sa[4],
pHdr->sa[5]);
-
+
if(pOperatingModeframe->OperatingMode.chanWidth == eHT_CHANNEL_WIDTH_80MHZ)
{
pSta->vhtSupportedChannelWidthSet = WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ;
@@ -2172,7 +2173,7 @@
break;
}
}
- }
+ }
#endif
default:
PELOGE(limLog(pMac, LOGE, FL("Action category %d not handled\n"), pActionHdr->category);)
diff --git a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
index 0ae9a0a..e729f6b 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
@@ -211,7 +211,7 @@
// Received Re/Assoc Req frame from a BC/MC address
// Log error and ignore it
if (subType == LIM_ASSOC)
- limLog(pMac, LOGW, FL("received Assoc frame from a BC/MC address "MAC_ADDRESS_STR),
+ limLog(pMac, LOGW, FL("received Assoc frame from a BC/MC address "MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(pHdr->sa));
else
limLog(pMac, LOGW, FL("received ReAssoc frame from a BC/MC address "MAC_ADDRESS_STR),
diff --git a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
index 210e9ef..8a22cf6 100644
--- a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
@@ -1431,7 +1431,7 @@
*/
authFrame.authAlgoNumber = eSIR_SHARED_KEY;
authFrame.authTransactionSeqNumber =
- SIR_MAC_AUTH_FRAME_4;
+ SIR_MAC_AUTH_FRAME_4;
authFrame.authStatusCode = eSIR_MAC_SUCCESS_STATUS;
limSendAuthMgmtFrame(pMac, &authFrame,
@@ -1463,20 +1463,20 @@
*/
authFrame.authAlgoNumber =
- pRxAuthFrameBody->authAlgoNumber;
+ pRxAuthFrameBody->authAlgoNumber;
authFrame.authTransactionSeqNumber =
- SIR_MAC_AUTH_FRAME_4;
+ SIR_MAC_AUTH_FRAME_4;
authFrame.authStatusCode =
- eSIR_MAC_CHALLENGE_FAILURE_STATUS;
+ eSIR_MAC_CHALLENGE_FAILURE_STATUS;
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
LIM_NO_WEP_IN_FC,psessionEntry);
// Log error
- PELOGE( limLog(pMac, LOGW,
- FL("Challenge failure for peer "MAC_ADDRESS_STR),
- MAC_ADDR_ARRAY(pHdr->sa));)
+ PELOGE( limLog(pMac, LOGW,
+ FL("Challenge failure for peer "MAC_ADDRESS_STR),
+ MAC_ADDR_ARRAY(pHdr->sa));)
return;
}
} // if (pMac->lim.gLimSystemRole == eLIM_AP_ROLE || ...
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index 892e7a4..f67cc30 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -2101,7 +2101,7 @@
if( NULL != pDelBssParams )
{
palFreeMemory( pMac->hHdd, (void *) pDelBssParams );
- }
+ }
return;
}
end:
diff --git a/CORE/MAC/src/pe/lim/limSessionUtils.c b/CORE/MAC/src/pe/lim/limSessionUtils.c
index 5c9db50..a6da379 100644
--- a/CORE/MAC/src/pe/lim/limSessionUtils.c
+++ b/CORE/MAC/src/pe/lim/limSessionUtils.c
@@ -249,7 +249,7 @@
/*--------------------------------------------------------------------------
\brief peGetActiveSessionChannel() - Gets the operating channel of first
valid session. Returns 0 if there is no
- valid session.
+ valid session.
\param pMac - pointer to global adapter context
diff --git a/CORE/MAC/src/pe/lim/limSessionUtils.h b/CORE/MAC/src/pe/lim/limSessionUtils.h
index df72a90..72106ff 100644
--- a/CORE/MAC/src/pe/lim/limSessionUtils.h
+++ b/CORE/MAC/src/pe/lim/limSessionUtils.h
@@ -60,18 +60,18 @@
------------------------------------------------------------------------*/
/*--------------------------------------------------------------------------
- \brief peGetVhtCapable() - Returns the Vht capable from a valid session.
+ \brief peGetVhtCapable() - Returns the Vht capable from a valid session.
- This function itrates the session Table and returns the VHT capable from first valid session
- if no sessions are valid/present it returns FALSE
+ This function iterates the session Table and returns the VHT capable from first valid session
+ if no sessions are valid/present it returns FALSE
- \param pMac - pointer to global adapter context
- \return - channel to scan from valid session else zero.
-
- \sa
-
+ \param pMac - pointer to global adapter context
+ \return - channel to scan from valid session else zero.
+
+ \sa
+
--------------------------------------------------------------------------*/
- tANI_U8 peGetVhtCapable(tpAniSirGlobal pMac);
+tANI_U8 peGetVhtCapable(tpAniSirGlobal pMac);
/*--------------------------------------------------------------------------
@@ -79,10 +79,10 @@
This function is called to validate the Join Request for a BT-AMP station. If start BSS session is present
this function returns TRUE else returns FALSE.
-
- \param pMac - pointer to global adapter context
- \return - return TRUE if start BSS session is present else return FALSE.
-
+
+ \param pMac - pointer to global adapter context
+ \return - return TRUE if start BSS session is present else return FALSE.
+
\sa
--------------------------------------------------------------------------*/
tANI_U8 peValidateBtJoinRequest(tpAniSirGlobal pMac);
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index c3998d9..fc73263 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -371,7 +371,7 @@
// Log error
limLog(pMac, LOGP,
FL("call to create heartbeat timer failed\n"));
- goto err_timer;
+ goto err_timer;
}
if (wlan_cfgGetInt(pMac, WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT,
@@ -400,7 +400,7 @@
// Log error
limLog(pMac, LOGP,
FL("unable to create ProbeAfterHBTimer\n"));
- goto err_timer;
+ goto err_timer;
}
#if defined(ANI_OS_TYPE_RTAI_LINUX)
@@ -448,7 +448,7 @@
// Log error
limLog(pMac, LOGP,
FL("call to create background scan timer failed\n"));
- goto err_timer;
+ goto err_timer;
}
#endif
}
@@ -469,7 +469,7 @@
// Log error
limLog(pMac, LOGP,
FL("create Disassociate throttle timer failed\n"));
- goto err_timer;
+ goto err_timer;
}
#if defined(ANI_OS_TYPE_RTAI_LINUX)
tx_timer_set_expiry_list(
@@ -517,7 +517,7 @@
{
// Cannot create keepalive timer. Log error.
limLog(pMac, LOGP, FL("Cannot create keepalive timer.\n"));
- goto err_timer;
+ goto err_timer;
}
/**
@@ -548,7 +548,7 @@
{
// Cannot create timer. Log error.
limLog(pMac, LOGP, FL("Cannot create CNF wait timer.\n"));
- goto err_timer;
+ goto err_timer;
}
}
@@ -614,7 +614,7 @@
// Cannot create update OLBC cache timer
// Log error
limLog(pMac, LOGP, FL("Cannot create update OLBC cache timer\n"));
- goto err_timer;
+ goto err_timer;
}
}
#endif
@@ -672,7 +672,7 @@
}
#endif
- return TX_SUCCESS;
+ return TX_SUCCESS;
err_timer:
#ifdef FEATURE_WLAN_CCX
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index ceaae5c..6be51d6 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -884,7 +884,7 @@
tANI_U32 retVal;
pMac->lim.gLimTimersCreated = 0;
-
+
MTRACE(macTrace(pMac, TRACE_CODE_MLM_STATE, NO_SESSION, pMac->lim.gLimMlmState));
/// Initialize scan result hash table
@@ -7952,7 +7952,7 @@
return eANI_BOOLEAN_FALSE;
}
}
-
+
#ifdef WLAN_FEATURE_11AC
tANI_BOOLEAN limCheckVHTOpModeChange( tpAniSirGlobal pMac, tpPESession psessionEntry, tANI_U8 chanWidth, tANI_U8 staId)
{
diff --git a/CORE/MAC/src/pe/lim/limUtils.h b/CORE/MAC/src/pe/lim/limUtils.h
index 1cb432d..382146a 100644
--- a/CORE/MAC/src/pe/lim/limUtils.h
+++ b/CORE/MAC/src/pe/lim/limUtils.h
@@ -399,7 +399,7 @@
#ifdef WLAN_FEATURE_11AC
tANI_BOOLEAN limCheckVHTOpModeChange( tpAniSirGlobal pMac,
- tpPESession psessionEntry, tANI_U8 chanWidth, tANI_U8 staId);
+ tpPESession psessionEntry, tANI_U8 chanWidth, tANI_U8 staId);
#endif
#ifdef FEATURE_WLAN_DIAG_SUPPORT
diff --git a/CORE/SAP/src/sapChSelect.c b/CORE/SAP/src/sapChSelect.c
index b3cf0fb..0adf9d0 100644
--- a/CORE/SAP/src/sapChSelect.c
+++ b/CORE/SAP/src/sapChSelect.c
@@ -93,16 +93,16 @@
============================================================================*/
void sapCleanupChannelList(void)
-{
+{
v_PVOID_t pvosGCtx = vos_get_global_context(VOS_MODULE_ID_SAP, NULL);
- ptSapContext pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
+ ptSapContext pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO,
- "Cleaning up the channel list structure");
-
- pSapCtx->SapChnlList.numChannel =0;
- vos_mem_free(pSapCtx->SapChnlList.channelList);
- pSapCtx->SapChnlList.channelList = NULL;
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO,
+ "Cleaning up the channel list structure");
+
+ pSapCtx->SapChnlList.numChannel =0;
+ vos_mem_free(pSapCtx->SapChnlList.channelList);
+ pSapCtx->SapChnlList.channelList = NULL;
}
/*==========================================================================
@@ -127,107 +127,107 @@
int sapSetPreferredChannel(struct net_device *dev, tANI_U8* ptr)
{
-
- v_PVOID_t pvosGCtx = vos_get_global_context(VOS_MODULE_ID_SAP, NULL);
- ptSapContext pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
- tANI_U8* param;
- int tempInt;
- int j;
-
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Enter: %s", __FUNCTION__);
- if(NULL != pSapCtx->SapChnlList.channelList)
- {
- sapCleanupChannelList();
- }
+ v_PVOID_t pvosGCtx = vos_get_global_context(VOS_MODULE_ID_SAP, NULL);
+ ptSapContext pSapCtx = VOS_GET_SAP_CB(pvosGCtx);
+ tANI_U8* param;
+ int tempInt;
+ int j;
- param = strchr(ptr, ' ');
- /*no argument after the command*/
- if (NULL == param)
- {
- return -EINVAL;
- }
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ "Enter: %s", __FUNCTION__);
- /*no space after the command*/
- else if (SPACE_ASCII_VALUE != *param)
- {
- return -EINVAL;
- }
-
- param++;
+ if (NULL != pSapCtx->SapChnlList.channelList)
+ {
+ sapCleanupChannelList();
+ }
- /*removing empty spaces*/
- while((SPACE_ASCII_VALUE == *param)&& ('\0' != *param) ) param++;
+ param = strchr(ptr, ' ');
+ /*no argument after the command*/
+ if (NULL == param)
+ {
+ return -EINVAL;
+ }
- /*no argument followed by spaces*/
- if('\0' == *param)
- {
- return -EINVAL;
- }
+ /*no space after the command*/
+ else if (SPACE_ASCII_VALUE != *param)
+ {
+ return -EINVAL;
+ }
- /*getting the first argument ie the number of channels*/
- sscanf(param, "%d ", &tempInt);
- pSapCtx->SapChnlList.numChannel = tempInt;
-
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Number of channel added are: %d",
- pSapCtx->SapChnlList.numChannel);
+ param++;
- /*allocating space for the desired number of channels*/
- pSapCtx->SapChnlList.channelList =
- (v_U8_t *)vos_mem_malloc(pSapCtx->SapChnlList.numChannel);
-
- for(j=0;j<pSapCtx->SapChnlList.numChannel;j++)
- {
+ /*removing empty spaces*/
+ while((SPACE_ASCII_VALUE == *param)&& ('\0' != *param) ) param++;
- /*param pointing to the beginning of first space after number of channels*/
- param = strpbrk( param, " " );
- /*no channel list after the number of channels argument*/
- if (NULL == param)
- {
- sapCleanupChannelList();
- return -EINVAL;
- }
-
- param++;
+ /*no argument followed by spaces*/
+ if('\0' == *param)
+ {
+ return -EINVAL;
+ }
- /*removing empty space*/
- while((SPACE_ASCII_VALUE == *param) && ('\0' != *param) ) param++;
+ /*getting the first argument ie the number of channels*/
+ sscanf(param, "%d ", &tempInt);
+ pSapCtx->SapChnlList.numChannel = tempInt;
- /*no channel list after the number of channels argument and spaces*/
- if( '\0' == *param )
- {
- sapCleanupChannelList();
- return -EINVAL;
- }
-
- sscanf(param, "%d ", &tempInt);
- pSapCtx->SapChnlList.channelList[j] = tempInt;
-
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Channel %d added to preferred channel list",
- pSapCtx->SapChnlList.channelList[j] );
-
- }
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ "Number of channel added are: %d",
+ pSapCtx->SapChnlList.numChannel);
- /*extra arguments check*/
- param = strpbrk( param, " " );
- if (NULL != param)
- {
- while((SPACE_ASCII_VALUE == *param) && ('\0' != *param) ) param++;
-
- if('\0' != *param)
- {
- sapCleanupChannelList();
- return -EINVAL;
- }
- }
+ /*allocating space for the desired number of channels*/
+ pSapCtx->SapChnlList.channelList =
+ (v_U8_t *)vos_mem_malloc(pSapCtx->SapChnlList.numChannel);
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Exit: %s", __FUNCTION__);
-
- return 0;
+ for(j=0;j<pSapCtx->SapChnlList.numChannel;j++)
+ {
+
+ /*param pointing to the beginning of first space after number of channels*/
+ param = strpbrk( param, " " );
+ /*no channel list after the number of channels argument*/
+ if (NULL == param)
+ {
+ sapCleanupChannelList();
+ return -EINVAL;
+ }
+
+ param++;
+
+ /*removing empty space*/
+ while((SPACE_ASCII_VALUE == *param) && ('\0' != *param) ) param++;
+
+ /*no channel list after the number of channels argument and spaces*/
+ if( '\0' == *param )
+ {
+ sapCleanupChannelList();
+ return -EINVAL;
+ }
+
+ sscanf(param, "%d ", &tempInt);
+ pSapCtx->SapChnlList.channelList[j] = tempInt;
+
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ "Channel %d added to preferred channel list",
+ pSapCtx->SapChnlList.channelList[j] );
+
+ }
+
+ /*extra arguments check*/
+ param = strpbrk( param, " " );
+ if (NULL != param)
+ {
+ while((SPACE_ASCII_VALUE == *param) && ('\0' != *param) ) param++;
+
+ if('\0' != *param)
+ {
+ sapCleanupChannelList();
+ return -EINVAL;
+ }
+ }
+
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ "Exit: %s", __FUNCTION__);
+
+ return 0;
}
/*==========================================================================
@@ -252,40 +252,40 @@
v_U8_t: best channel
============================================================================*/
v_U8_t sapSelectPreferredChannelFromChannelList(v_U8_t bestChNum,
- ptSapContext pSapCtx,
- tSapChSelSpectInfo *pSpectInfoParams)
-{
- v_U8_t j = 0;
- v_U8_t count = 0;
+ ptSapContext pSapCtx,
+ tSapChSelSpectInfo *pSpectInfoParams)
+{
+ v_U8_t j = 0;
+ v_U8_t count = 0;
//If Channel List is not Configured don't do anything
//Else return the Best Channel from the Channel List
- if((NULL == pSapCtx->SapChnlList.channelList) ||
- (NULL == pSpectInfoParams) ||
- (0 == pSapCtx->SapChnlList.numChannel))
- {
- return bestChNum;
- }
-
- if (bestChNum > 0 && bestChNum <= 252)
+ if((NULL == pSapCtx->SapChnlList.channelList) ||
+ (NULL == pSpectInfoParams) ||
+ (0 == pSapCtx->SapChnlList.numChannel))
{
- for(count=0; count < pSpectInfoParams->numSpectChans ; count++)
+ return bestChNum;
+ }
+
+ if (bestChNum > 0 && bestChNum <= 252)
+ {
+ for(count=0; count < pSpectInfoParams->numSpectChans ; count++)
{
bestChNum = (v_U8_t)pSpectInfoParams->pSpectCh[count].chNum;
// Select the best channel from allowed list
for(j=0;j< pSapCtx->SapChnlList.numChannel;j++)
- {
+ {
if( (pSapCtx->SapChnlList.channelList[j]) == bestChNum)
{
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- "Best channel computed from Channel List is: %d",
- bestChNum);
- return bestChNum;
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
+ "Best channel computed from Channel List is: %d",
+ bestChNum);
+ return bestChNum;
}
}
- }
-
- return SAP_CHANNEL_NOT_SELECTED;
+ }
+
+ return SAP_CHANNEL_NOT_SELECTED;
}
else
return SAP_CHANNEL_NOT_SELECTED;
@@ -677,7 +677,7 @@
#endif
//Select Best Channel from Channel List if Configured
- bestChNum = sapSelectPreferredChannelFromChannelList(bestChNum, pSapCtx, pSpectInfoParams);
+ bestChNum = sapSelectPreferredChannelFromChannelList(bestChNum, pSapCtx, pSpectInfoParams);
// Free all the allocated memory
sapChanSelExit(pSpectInfoParams);
diff --git a/CORE/SAP/src/sapChSelect.h b/CORE/SAP/src/sapChSelect.h
index a149a95..25ea2f9 100644
--- a/CORE/SAP/src/sapChSelect.h
+++ b/CORE/SAP/src/sapChSelect.h
@@ -90,8 +90,8 @@
#define SPACE_ASCII_VALUE 32
typedef struct sSapChannelListInfo{
- v_U8_t numChannel;
- v_U8_t *channelList;
+ v_U8_t numChannel;
+ v_U8_t *channelList;
} tSapChannelListInfo;
typedef struct {
diff --git a/CORE/SAP/src/sapInternal.h b/CORE/SAP/src/sapInternal.h
index 7d0b324..39a6c04 100644
--- a/CORE/SAP/src/sapInternal.h
+++ b/CORE/SAP/src/sapInternal.h
@@ -207,7 +207,7 @@
v_U32_t nStaAddIeLength;
v_U8_t pStaAddIE[MAX_ASSOC_IND_IE_LEN];
v_U8_t *channelList;
- tSapChannelListInfo SapChnlList;
+ tSapChannelListInfo SapChnlList;
} *ptSapContext;
@@ -412,7 +412,7 @@
IN
halHandle : Pointer to HAL handle
- pSapCtx : Pointer to SAP context
+ pSapCtx : Pointer to SAP context
pResult : Pointer to tScanResultHandle
RETURN VALUE
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 44e5bae..47583d2 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -3140,7 +3140,7 @@
case PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH:
return PHY_DOUBLE_CHANNEL_LOW_PRIMARY;
case PHY_QUADRUPLE_CHANNEL_20MHZ_CENTERED_40MHZ_CENTERED:
- default :
+ default :
return PHY_SINGLE_CHANNEL_CENTERED;
}
}
@@ -3220,13 +3220,13 @@
#ifdef WLAN_FEATURE_11AC
if(cfgCb > 2 )
{
- if(!WDA_getFwWlanFeatCaps(DOT11AC)) {
+ if(!WDA_getFwWlanFeatCaps(DOT11AC)) {
cfgCb = csrGetHTCBStateFromVHTCBState(cfgCb);
- }
- else
- {
+ }
+ else
+ {
ccmCfgSetInt(pMac, WNI_CFG_VHT_CHANNEL_WIDTH, pMac->roam.configParam.nVhtChannelWidth, NULL, eANI_BOOLEAN_FALSE);
- }
+ }
}
else
#endif
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 8a67373..22e7af1 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -592,7 +592,7 @@
{
eHalStatus status = eHAL_STATUS_FAILURE;
tSmeCmd *pScanCmd = NULL;
- eCsrConnectState ConnectState;
+ eCsrConnectState ConnectState;
do
{
@@ -4396,11 +4396,11 @@
break;
case eCsrScanGetScanChnInfo:
pScanChnInfo = (tSmeGetScanChnRsp *)pMsgBuf;
- /*
- * status code not available in tSmeGetScanChnRsp, so
- * by default considereing it to be success
- */
- scanStatus = eSIR_SME_SUCCESS;
+ /*
+ * status code not available in tSmeGetScanChnRsp, so
+ * by default considereing it to be success
+ */
+ scanStatus = eSIR_SME_SUCCESS;
csrScanAgeResults(pMac, pScanChnInfo);
break;
case eCsrScanForCapsChange:
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index e4086f6..bf605c4 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -5812,14 +5812,14 @@
#ifdef WLAN_FEATURE_11AC
case eCSR_DOT11_MODE_11ac:
- if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC))
- {
- cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC;
- }
- else
- {
- cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N;
- }
+ if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC))
+ {
+ cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC;
+ }
+ else
+ {
+ cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N;
+ }
break;
case eCSR_DOT11_MODE_11ac_ONLY:
cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC_ONLY;
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 70d8bbc..74df917 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -5280,7 +5280,7 @@
if(( pSession->connectedProfile.BSSType == eCSR_BSS_TYPE_INFRASTRUCTURE ) ||
( pSession->connectedProfile.BSSType == eCSR_BSS_TYPE_IBSS ) ||
-#ifdef WLAN_SOFTAP_FEATURE
+#ifdef WLAN_SOFTAP_FEATURE
( pSession->connectedProfile.BSSType == eCSR_BSS_TYPE_INFRA_AP ) ||
#endif
( pSession->connectedProfile.BSSType == eCSR_BSS_TYPE_START_IBSS ))
diff --git a/CORE/SYS/legacy/src/utils/src/parserApi.c b/CORE/SYS/legacy/src/utils/src/parserApi.c
index 76765b2..180e171 100644
--- a/CORE/SYS/legacy/src/utils/src/parserApi.c
+++ b/CORE/SYS/legacy/src/utils/src/parserApi.c
@@ -293,7 +293,7 @@
void
PopulateDot11fWiderBWChanSwitchAnn(tpAniSirGlobal pMac,
tDot11fIEWiderBWChanSwitchAnn *pDot11f,
- tpPESession psessionEntry)
+ tpPESession psessionEntry)
{
pDot11f->present = 1;
pDot11f->newChanWidth = psessionEntry->gLimWiderBWChannelSwitch.newChanWidth;
diff --git a/CORE/VOSS/src/vos_event.c b/CORE/VOSS/src/vos_event.c
index 662f28b..05c858a 100644
--- a/CORE/VOSS/src/vos_event.c
+++ b/CORE/VOSS/src/vos_event.c
@@ -435,8 +435,8 @@
ret = wait_for_completion_interruptible(&event->complete);
if ( 0 != ret )
{
- // negative means interrupted
- return VOS_STATUS_E_TIMEOUT;
+ // negative means interrupted
+ return VOS_STATUS_E_TIMEOUT;
}
}
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index fb9e729..af40da8 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -1962,8 +1962,8 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: pWDA_ScanParam received NULL", __FUNCTION__);
VOS_ASSERT(0);
- vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
- vos_mem_free(pWdaParams);
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams);
return ;
}
if(WDI_STATUS_SUCCESS != wdiStatus)
@@ -2111,7 +2111,7 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: pWDA_ScanParam received NULL", __FUNCTION__);
VOS_ASSERT(0) ;
- vos_mem_free(pWdaParams);
+ vos_mem_free(pWdaParams);
return ;
}
if(NULL == pWdaParams->wdaWdiApiMsgParam)
@@ -2119,7 +2119,7 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: wdaWdiApiMsgParam is NULL", __FUNCTION__);
VOS_ASSERT(0) ;
- vos_mem_free(pWdaParams);
+ vos_mem_free(pWdaParams);
return ;
}
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
@@ -2213,8 +2213,8 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: endScanParam received NULL", __FUNCTION__);
VOS_ASSERT(0) ;
- vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
- vos_mem_free(pWdaParams);
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams);
return ;
}
@@ -2308,8 +2308,8 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: finishScanParam is NULL", __FUNCTION__);
VOS_ASSERT(0) ;
- vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
- vos_mem_free(pWdaParams);
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams);
return ;
}
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
@@ -4784,7 +4784,7 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: VOS MEM Alloc Failure", __FUNCTION__);
VOS_ASSERT(0);
- vos_mem_free(pGetStatsParams);
+ vos_mem_free(pGetStatsParams);
return VOS_STATUS_E_NOMEM;
}
pGetPEStatsRspParams->msgType = WDA_GET_STATISTICS_RSP;
@@ -4841,7 +4841,7 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: VOS MEM Alloc Failure", __FUNCTION__);
VOS_ASSERT(0);
- vos_mem_free(pEdcaParams);
+ vos_mem_free(pEdcaParams);
return VOS_STATUS_E_NOMEM;
}
pWdaParams = (tWDA_ReqParams *)vos_mem_malloc(sizeof(tWDA_ReqParams)) ;
@@ -4851,7 +4851,7 @@
"%s: VOS MEM Alloc Failure", __FUNCTION__);
VOS_ASSERT(0);
vos_mem_free(wdiEdcaParam);
- vos_mem_free(pEdcaParams);
+ vos_mem_free(pEdcaParams);
return VOS_STATUS_E_NOMEM;
}
wdiEdcaParam->wdiEDCAInfo.ucBssIdx = pEdcaParams->bssIdx;
@@ -4994,8 +4994,8 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: pAddBAReqParams received NULL " ,__FUNCTION__);
VOS_ASSERT( 0 );
- vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
- vos_mem_free(pWdaParams);
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
+ vos_mem_free(pWdaParams);
return ;
}
vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ;
@@ -5795,8 +5795,8 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: pMaxTxPowerParams received NULL " ,__FUNCTION__);
VOS_ASSERT(0);
- vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
- vos_mem_free(pWdaParams);
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams);
return ;
}
@@ -6598,7 +6598,7 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: invalid param", __FUNCTION__);
VOS_ASSERT(0);
- vos_mem_free(pPowerSaveCfg);
+ vos_mem_free(pPowerSaveCfg);
return VOS_STATUS_E_FAILURE;
}
wdiPowerSaveCfg = vos_mem_malloc(sizeof(WDI_UpdateCfgReqParamsType));
@@ -6607,7 +6607,7 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: VOS MEM Alloc Failure", __FUNCTION__);
VOS_ASSERT(0);
- vos_mem_free(pPowerSaveCfg);
+ vos_mem_free(pPowerSaveCfg);
return VOS_STATUS_E_NOMEM;
}
pWdaParams = (tWDA_ReqParams *)vos_mem_malloc(sizeof(tWDA_ReqParams)) ;
@@ -6617,7 +6617,7 @@
"%s: VOS MEM Alloc Failure", __FUNCTION__);
VOS_ASSERT(0);
vos_mem_free(wdiPowerSaveCfg);
- vos_mem_free(pPowerSaveCfg);
+ vos_mem_free(pPowerSaveCfg);
return VOS_STATUS_E_NOMEM;
}
configParamSize = (sizeof(tHalCfg) + (sizeof(tANI_U32))) * WDA_NUM_PWR_SAVE_CFG;
@@ -6626,10 +6626,10 @@
{
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: VOS MEM Alloc Failure \n", __FUNCTION__);
- VOS_ASSERT(0);
+ VOS_ASSERT(0);
vos_mem_free(pWdaParams);
vos_mem_free(wdiPowerSaveCfg);
- vos_mem_free(pPowerSaveCfg);
+ vos_mem_free(pPowerSaveCfg);
return VOS_STATUS_E_NOMEM;
}
vos_mem_set(configParam, configParamSize, 0);
@@ -8161,7 +8161,7 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: VOS MEM Alloc Failure", __FUNCTION__);
VOS_ASSERT(0);
- vos_mem_free(pWdaParams);
+ vos_mem_free(pWdaParams);
return ;
}
vos_mem_zero(pFlushACRspParams,sizeof(tFlushACRsp));
@@ -9169,7 +9169,7 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s:pWDA is NULL", __FUNCTION__);
VOS_ASSERT(0);
- vos_mem_free(pMsg->bodyptr);
+ vos_mem_free(pMsg->bodyptr);
return VOS_STATUS_E_FAILURE;
}
/* Process all the WDA messages.. */
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index b70ac32..09454f8 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -7417,10 +7417,10 @@
/* Allocation of BssReqMsg Memory Based on Firmware Capabilities */
#ifdef WLAN_FEATURE_11AC
if (WDI_getFwWlanFeatCaps(DOT11AC))
- uMsgSize = sizeof(halConfigBssReqMsg.uBssParams.configBssParams_V1); // Version - 1 For 11AC
+ uMsgSize = sizeof(halConfigBssReqMsg.uBssParams.configBssParams_V1); // Version - 1 For 11AC
else
#endif
- uMsgSize = sizeof(halConfigBssReqMsg.uBssParams.configBssParams); // default Version - 0 Structure
+ uMsgSize = sizeof(halConfigBssReqMsg.uBssParams.configBssParams); // default Version - 0 Structure
/*-----------------------------------------------------------------------
Get message buffer
@@ -10392,10 +10392,10 @@
/* Allocation of StaReqMsg Memory Based on Firmware Capabilities */
#ifdef WLAN_FEATURE_11AC
if (WDI_getFwWlanFeatCaps(DOT11AC))
- uMsgSize = sizeof(halConfigStaReqMsg.uStaParams.configStaParams_V1); // Version-1 For 11AC
+ uMsgSize = sizeof(halConfigStaReqMsg.uStaParams.configStaParams_V1); // Version-1 For 11AC
else
#endif
- uMsgSize = sizeof(halConfigStaReqMsg.uStaParams.configStaParams); // Version-0 Default
+ uMsgSize = sizeof(halConfigStaReqMsg.uStaParams.configStaParams); // Version-0 Default
/*-----------------------------------------------------------------------
Get message buffer
@@ -16747,11 +16747,12 @@
*/
if (wdiStatus != WDI_STATUS_SUCCESS) {
- WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
- "WDI PRocess Enter IMPS RSP failed With HAL Status Code: %d",halStatus);
- /* Call Back is not required as we are putting the DXE in FULL
- * and riva is already in full (IMPS RSP Failed)*/
- WDTS_SetPowerState(pWDICtx, WDTS_POWER_STATE_FULL, NULL);
+ WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
+ "WDI Process Enter IMPS RSP failed With HAL Status Code: %d",
+ halStatus);
+ /* Call Back is not required as we are putting the DXE in FULL
+ * and riva is already in full (IMPS RSP Failed)*/
+ WDTS_SetPowerState(pWDICtx, WDTS_POWER_STATE_FULL, NULL);
}
/*Notify UMAC*/
wdiEnterImpsRspCb( wdiStatus, pWDICtx->pRspCBUserData);
@@ -16876,7 +16877,8 @@
{
WPAL_TRACE(eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_FATAL,
- "WDI PRocess Enter BMPS RSP failed With HAL Status Code: %d",halStatus);
+ "WDI Process Enter BMPS RSP failed With HAL Status Code: %d",
+ halStatus);
/* Call Back is not required as we are putting the DXE in FULL
* and riva is already in FULL (BMPS RSP Failed)*/
WDTS_SetPowerState(pWDICtx, WDTS_POWER_STATE_FULL, NULL);
@@ -19154,10 +19156,10 @@
/* Fill msgVersion */
#ifdef WLAN_FEATURE_11AC
if (WDI_getFwWlanFeatCaps(DOT11AC))
- halMsgHeader.msgVersion = WLAN_HAL_MSG_VERSION1;
+ halMsgHeader.msgVersion = WLAN_HAL_MSG_VERSION1;
else
#endif
- halMsgHeader.msgVersion = WLAN_HAL_MSG_VERSION0;
+ halMsgHeader.msgVersion = WLAN_HAL_MSG_VERSION0;
halMsgHeader.msgLen = sizeof(halMsgHeader) + usBufferLen;
*pusDataOffset = sizeof(halMsgHeader);
@@ -21415,7 +21417,7 @@
tConfigStaParams_V1* phalConfigSta_V1 = NULL;
if (WDI_getFwWlanFeatCaps(DOT11AC))
{
- phalConfigSta_V1 = (tConfigStaParams_V1*)phalConfigSta;
+ phalConfigSta_V1 = (tConfigStaParams_V1*)phalConfigSta;
}
#endif
/*Lightweight function - no sanity checks and no unecessary code to increase
@@ -21483,10 +21485,10 @@
#ifdef WLAN_FEATURE_11AC
if(phalConfigSta_V1 != NULL)
{
- phalConfigSta_V1->supportedRates.vhtRxMCSMap = pwdiConfigSta->wdiSupportedRates.vhtRxMCSMap;
- phalConfigSta_V1->supportedRates.vhtRxHighestDataRate = pwdiConfigSta->wdiSupportedRates.vhtRxHighestDataRate;
- phalConfigSta_V1->supportedRates.vhtTxMCSMap = pwdiConfigSta->wdiSupportedRates.vhtTxMCSMap;
- phalConfigSta_V1->supportedRates.vhtTxHighestDataRate = pwdiConfigSta->wdiSupportedRates.vhtTxHighestDataRate;
+ phalConfigSta_V1->supportedRates.vhtRxMCSMap = pwdiConfigSta->wdiSupportedRates.vhtRxMCSMap;
+ phalConfigSta_V1->supportedRates.vhtRxHighestDataRate = pwdiConfigSta->wdiSupportedRates.vhtRxHighestDataRate;
+ phalConfigSta_V1->supportedRates.vhtTxMCSMap = pwdiConfigSta->wdiSupportedRates.vhtTxMCSMap;
+ phalConfigSta_V1->supportedRates.vhtTxHighestDataRate = pwdiConfigSta->wdiSupportedRates.vhtTxHighestDataRate;
}
#endif
@@ -21497,8 +21499,8 @@
#ifdef WLAN_FEATURE_11AC
if(phalConfigSta_V1 != NULL)
{
- phalConfigSta_V1->vhtCapable = pwdiConfigSta->ucVhtCapableSta;
- phalConfigSta_V1->vhtTxChannelWidthSet = pwdiConfigSta->ucVhtTxChannelWidthSet;
+ phalConfigSta_V1->vhtCapable = pwdiConfigSta->ucVhtCapableSta;
+ phalConfigSta_V1->vhtTxChannelWidthSet = pwdiConfigSta->ucVhtTxChannelWidthSet;
}
#endif
}/*WDI_CopyWDIStaCtxToHALStaCtx*/;
@@ -21598,7 +21600,7 @@
/* Get the Version 1 Handler */
tConfigBssParams_V1* phalConfigBSS_V1 = NULL;
if (WDI_getFwWlanFeatCaps(DOT11AC))
- phalConfigBSS_V1 = (tConfigBssParams_V1*)phalConfigBSS;
+ phalConfigBSS_V1 = (tConfigBssParams_V1*)phalConfigBSS;
#endif
wpalMemoryCopy( phalConfigBSS->bssId,