diff options
| author | Ravi Joshi <ravij@qca.qualcomm.com> | 2014-05-06 18:58:11 -0700 |
|---|---|---|
| committer | Pitani Venkata Rajesh Kumar <c_vpitan@qti.qualcomm.com> | 2014-05-14 12:47:25 +0530 |
| commit | f6fa2b4e04f84f4f4dadacd4eb4991f007152954 (patch) | |
| tree | 4668c6a3396da95d9db729a1b98bfdc8228672a6 | |
| parent | a004e111e65fdebb58d76132adef41954e7e1129 (diff) | |
wlan: Remove references to WNI_CFG_BSSID and WNI_CFG_BSSID_LEN
WNI_CFG_BSSID cfg item is global and was designed to be used
when there is only one session. Given that the driver supports
more than one sessions and each have their own BSSIDs, this
CFG item does not make sense to be used.
Change-Id: I2f3abb2b9c468240276625027363ea5b4457d6df
CRs-Fixed: 660400
30 files changed, 696 insertions, 1004 deletions
diff --git a/CORE/BAP/src/bapModule.c b/CORE/BAP/src/bapModule.c index f7f9a48a1429..bb52a4af8fa0 100644 --- a/CORE/BAP/src/bapModule.c +++ b/CORE/BAP/src/bapModule.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -123,7 +123,7 @@ tBtampHCI_Version_Info btampHCI_Version_Info; // Include the Local Supported Cmds info structure. tBtampHCI_Supported_Cmds btampHCI_Supported_Cmds; -static unsigned char pBtStaOwnMacAddr[WNI_CFG_BSSID_LEN]; +static unsigned char pBtStaOwnMacAddr[VOS_MAC_ADDR_SIZE]; /*BT-AMP SSID; per spec should have this format: "AMP-00-0a-f5-04-05-08" */ #define WLAN_BAP_SSID_MAX_LEN 21 @@ -1198,7 +1198,7 @@ WLANBAP_ReadMacConfig ptBtampContext pBtampCtx ) { - tANI_U32 len = WNI_CFG_BSSID_LEN; + tANI_U32 len = VOS_MAC_ADDR_SIZE; tHalHandle pMac = NULL; /*------------------------------------------------------------------------ @@ -1223,7 +1223,7 @@ WLANBAP_ReadMacConfig ccmCfgGetStr( pMac, WNI_CFG_STA_ID, pBtStaOwnMacAddr, &len ); - if (WNI_CFG_BSSID_LEN != len) + if (VOS_MAC_ADDR_SIZE != len) { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "len is improper %s", __func__); diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c index 137bcc397740..e5440e4b9a90 100644 --- a/CORE/HDD/src/wlan_hdd_assoc.c +++ b/CORE/HDD/src/wlan_hdd_assoc.c @@ -1263,10 +1263,10 @@ void hdd_PerformRoamSetKeyComplete(hdd_adapter_t *pAdapter) roamInfo.fAuthRequired = FALSE; vos_mem_copy(roamInfo.bssid, pHddStaCtx->roam_info.bssid, - WNI_CFG_BSSID_LEN); + VOS_MAC_ADDR_SIZE); vos_mem_copy(roamInfo.peerMac, pHddStaCtx->roam_info.peerMac, - WNI_CFG_BSSID_LEN); + VOS_MAC_ADDR_SIZE); halStatus = hdd_RoamSetKeyCompleteHandler(pAdapter, &roamInfo, @@ -2160,7 +2160,7 @@ static eHalStatus roamRoamConnectStatusUpdateHandler( hdd_adapter_t *pAdapter, t { pHddStaCtx->ibss_enc_key.keyDirection = eSIR_TX_RX; memcpy(&pHddStaCtx->ibss_enc_key.peerMac, - pRoamInfo->peerMac, WNI_CFG_BSSID_LEN); + pRoamInfo->peerMac, VOS_MAC_ADDR_SIZE); VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "New peer joined set PTK encType=%d", @@ -4351,9 +4351,9 @@ void hdd_indicateCckmPreAuth(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo) pos += nBytes; freeBytes -= nBytes; - vos_mem_copy(pos, pRoamInfo->bssid, WNI_CFG_BSSID_LEN); - pos += WNI_CFG_BSSID_LEN; - freeBytes -= WNI_CFG_BSSID_LEN; + vos_mem_copy(pos, pRoamInfo->bssid, VOS_MAC_ADDR_SIZE); + pos += VOS_MAC_ADDR_SIZE; + freeBytes -= VOS_MAC_ADDR_SIZE; nBytes = snprintf(pos, freeBytes, " %u:%u", pRoamInfo->timestamp[0], pRoamInfo->timestamp[1]); diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index b91814767d2e..65e06d8a3d13 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -1269,7 +1269,7 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t* pAdapter, u8 key_index, else { isConnected = hdd_connIsConnected(pHddStaCtx); - vos_mem_copy(setKey.peerMac,&pHddStaCtx->conn_info.bssId,WNI_CFG_BSSID_LEN); + vos_mem_copy(setKey.peerMac,&pHddStaCtx->conn_info.bssId, VOS_MAC_ADDR_SIZE); } setKey.keyLength = key_Len; pKeyPtr = setKey.Key; @@ -4017,7 +4017,7 @@ static int wlan_hdd_cfg80211_add_key( struct wiphy *wiphy, { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR( ndev ); tCsrRoamSetKey setKey; - u8 groupmacaddr[WNI_CFG_BSSID_LEN] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; + u8 groupmacaddr[VOS_MAC_ADDR_SIZE] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; int status; v_U32_t roamId= 0xFF; #ifndef WLAN_FEATURE_MBSSID @@ -4161,7 +4161,7 @@ static int wlan_hdd_cfg80211_add_key( struct wiphy *wiphy, "%s- %d: setting Broadcast key", __func__, __LINE__); setKey.keyDirection = eSIR_RX_ONLY; - vos_mem_copy(setKey.peerMac,groupmacaddr,WNI_CFG_BSSID_LEN); + vos_mem_copy(setKey.peerMac,groupmacaddr, VOS_MAC_ADDR_SIZE); } else { @@ -4170,7 +4170,7 @@ static int wlan_hdd_cfg80211_add_key( struct wiphy *wiphy, "%s- %d: setting pairwise key", __func__, __LINE__); setKey.keyDirection = eSIR_TX_RX; - vos_mem_copy(setKey.peerMac, mac_addr,WNI_CFG_BSSID_LEN); + vos_mem_copy(setKey.peerMac, mac_addr, VOS_MAC_ADDR_SIZE); } if ((WLAN_HDD_IBSS == pAdapter->device_mode) && !pairwise) { @@ -4336,7 +4336,7 @@ static int wlan_hdd_cfg80211_add_key( struct wiphy *wiphy, ) { setKey.keyDirection = eSIR_RX_ONLY; - vos_mem_copy(setKey.peerMac,groupmacaddr,WNI_CFG_BSSID_LEN); + vos_mem_copy(setKey.peerMac,groupmacaddr, VOS_MAC_ADDR_SIZE); hddLog(VOS_TRACE_LEVEL_INFO_MED, "%s: set key peerMac %2x:%2x:%2x:%2x:%2x:%2x, direction %d", @@ -4453,7 +4453,7 @@ static int wlan_hdd_cfg80211_del_key( struct wiphy *wiphy, #if 0 hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR( ndev ); v_CONTEXT_t pVosContext = (WLAN_HDD_GET_CTX(pAdapter))->pvosContext; - u8 groupmacaddr[WNI_CFG_BSSID_LEN] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; + u8 groupmacaddr[VOS_MAC_ADDR_SIZE] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; tCsrRoamSetKey setKey; v_U32_t roamId= 0xFF; @@ -4474,9 +4474,9 @@ static int wlan_hdd_cfg80211_del_key( struct wiphy *wiphy, setKey.keyId = key_index; if (mac_addr) - vos_mem_copy(setKey.peerMac, mac_addr,WNI_CFG_BSSID_LEN); + vos_mem_copy(setKey.peerMac, mac_addr, VOS_MAC_ADDR_SIZE); else - vos_mem_copy(setKey.peerMac, groupmacaddr, WNI_CFG_BSSID_LEN); + vos_mem_copy(setKey.peerMac, groupmacaddr, VOS_MAC_ADDR_SIZE); setKey.encType = eCSR_ENCRYPT_TYPE_NONE; @@ -4630,7 +4630,7 @@ static int wlan_hdd_cfg80211_set_default_key( struct wiphy *wiphy, vos_mem_copy(setKey.peerMac, &pHddStaCtx->conn_info.bssId[0], - WNI_CFG_BSSID_LEN); + VOS_MAC_ADDR_SIZE); if (Keys->KeyLength[key_index] == CSR_WEP40_KEY_LEN && pWextState->roamProfile.EncryptionType.encryptionType[0] == @@ -4911,7 +4911,7 @@ wlan_hdd_cfg80211_inform_bss_frame( hdd_adapter_t *pAdapter, pAdapter->sessionCtx.station.conn_info.connState ) && ( VOS_TRUE == vos_mem_compare(bss_desc->bssId, pAdapter->sessionCtx.station.conn_info.bssId, - WNI_CFG_BSSID_LEN)) && + VOS_MAC_ADDR_SIZE)) && (pHddCtx->hdd_wlan_suspended == FALSE)) { /* supplicant takes the signal strength in terms of mBm(100*dBm) */ @@ -5959,17 +5959,17 @@ int wlan_hdd_cfg80211_connect_start( hdd_adapter_t *pAdapter, { pRoamProfile->BSSIDs.numOfBSSIDs = 1; vos_mem_copy((void *)(pRoamProfile->BSSIDs.bssid), bssid, - WNI_CFG_BSSID_LEN); + VOS_MAC_ADDR_SIZE); /* Save BSSID in seperate variable as well, as RoamProfile BSSID is getting zeroed out in the association process. And in case of join failure we should send valid BSSID to supplicant */ vos_mem_copy((void *)(pWextState->req_bssId), bssid, - WNI_CFG_BSSID_LEN); + VOS_MAC_ADDR_SIZE); } else { - vos_mem_zero((void *)(pRoamProfile->BSSIDs.bssid),WNI_CFG_BSSID_LEN); + vos_mem_zero((void *)(pRoamProfile->BSSIDs.bssid), VOS_MAC_ADDR_SIZE); } hddLog(LOG1, FL("Connect to SSID: %.*s operating Channel: %u"), @@ -8544,12 +8544,12 @@ static int wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *d for (j = 0; j < PMKIDCacheIndex; j++) { if(vos_mem_compare(PMKIDCache[j].BSSID, - pmksa->bssid, WNI_CFG_BSSID_LEN)) + pmksa->bssid, VOS_MAC_ADDR_SIZE)) { /* BSSID matched previous entry. Overwrite it. */ BSSIDMatched = 1; vos_mem_copy(PMKIDCache[j].BSSID, - pmksa->bssid, WNI_CFG_BSSID_LEN); + pmksa->bssid, VOS_MAC_ADDR_SIZE); vos_mem_copy(PMKIDCache[j].PMKID, pmksa->pmkid, CSR_RSN_PMKID_SIZE); @@ -8646,7 +8646,7 @@ static int wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *d { if (vos_mem_compare(PMKIDCache[j].BSSID, pmksa->bssid, - WNI_CFG_BSSID_LEN)) + VOS_MAC_ADDR_SIZE)) { /* BSSID matched entry */ BSSIDMatched = 1; @@ -8656,14 +8656,14 @@ static int wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *d /*replace the matching entry with the last entry in HDD local cache*/ vos_mem_copy(PMKIDCache[j].BSSID, PMKIDCache[PMKIDCacheIndex-1].BSSID, - WNI_CFG_BSSID_LEN); + VOS_MAC_ADDR_SIZE); vos_mem_copy(PMKIDCache[j].PMKID, PMKIDCache[PMKIDCacheIndex-1].PMKID, CSR_RSN_PMKID_SIZE); } /*clear the last entry in HDD cache ---[index-1]*/ - vos_mem_zero(PMKIDCache[PMKIDCacheIndex-1].BSSID, WNI_CFG_BSSID_LEN); + vos_mem_zero(PMKIDCache[PMKIDCacheIndex-1].BSSID, VOS_MAC_ADDR_SIZE); vos_mem_zero(PMKIDCache[PMKIDCacheIndex-1].PMKID, CSR_RSN_PMKID_SIZE); /*reduce the PMKID array index*/ @@ -8754,7 +8754,7 @@ static int wlan_hdd_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device status = -EINVAL; } /*clear the entry in HDD cache 0--index-1 */ - vos_mem_zero(PMKIDCache[j].BSSID, WNI_CFG_BSSID_LEN); + vos_mem_zero(PMKIDCache[j].BSSID, VOS_MAC_ADDR_SIZE); vos_mem_zero(PMKIDCache[j].PMKID, CSR_RSN_PMKID_SIZE); } @@ -9999,7 +9999,7 @@ int wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy, struct net_device *dev memcpy(pHddStaCtx->gtkOffloadReqParams.aKCK, data->kck, NL80211_KCK_LEN); memcpy(pHddStaCtx->gtkOffloadReqParams.aKEK, data->kek, NL80211_KEK_LEN); memcpy(pHddStaCtx->gtkOffloadReqParams.bssId, &pHddStaCtx->conn_info.bssId, - WNI_CFG_BSSID_LEN); + VOS_MAC_ADDR_SIZE); { /* changing from big to little endian since driver * works on little endian format diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c index 28648424bcc0..47278d176235 100644 --- a/CORE/HDD/src/wlan_hdd_early_suspend.c +++ b/CORE/HDD/src/wlan_hdd_early_suspend.c @@ -1531,7 +1531,7 @@ void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, v_BOOL_t fenable) { if ((eConnectionState_Associated == pHddStaCtx->conn_info.connState) && (0 == memcmp(&pHddStaCtx->gtkOffloadReqParams.bssId, - &pHddStaCtx->conn_info.bssId, WNI_CFG_BSSID_LEN)) && + &pHddStaCtx->conn_info.bssId, VOS_MAC_ADDR_SIZE)) && (GTK_OFFLOAD_ENABLE == pHddStaCtx->gtkOffloadReqParams.ulFlags)) { diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c index 817467704dbc..afdbc2aad55f 100644 --- a/CORE/HDD/src/wlan_hdd_hostapd.c +++ b/CORE/HDD/src/wlan_hdd_hostapd.c @@ -3078,7 +3078,7 @@ static int iw_set_ap_encodeext(struct net_device *dev, int retval = 0; VOS_STATUS vstatus; struct iw_encode_ext *ext = (struct iw_encode_ext*)extra; - v_U8_t groupmacaddr[WNI_CFG_BSSID_LEN] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; + v_U8_t groupmacaddr[VOS_MAC_ADDR_SIZE] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; int key_index; struct iw_point *encoding = &wrqu->encoding; tCsrRoamSetKey setKey; @@ -3104,10 +3104,10 @@ static int iw_set_ap_encodeext(struct net_device *dev, RemoveKey.keyId = key_index; if(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) { /*Key direction for group is RX only*/ - vos_mem_copy(RemoveKey.peerMac,groupmacaddr,WNI_CFG_BSSID_LEN); + vos_mem_copy(RemoveKey.peerMac,groupmacaddr, VOS_MAC_ADDR_SIZE); } else { - vos_mem_copy(RemoveKey.peerMac,ext->addr.sa_data,WNI_CFG_BSSID_LEN); + vos_mem_copy(RemoveKey.peerMac,ext->addr.sa_data, VOS_MAC_ADDR_SIZE); } switch(ext->alg) { @@ -3161,17 +3161,17 @@ static int iw_set_ap_encodeext(struct net_device *dev, if(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) { /*Key direction for group is RX only*/ setKey.keyDirection = eSIR_RX_ONLY; - vos_mem_copy(setKey.peerMac,groupmacaddr,WNI_CFG_BSSID_LEN); + vos_mem_copy(setKey.peerMac,groupmacaddr, VOS_MAC_ADDR_SIZE); } else { setKey.keyDirection = eSIR_TX_RX; - vos_mem_copy(setKey.peerMac,ext->addr.sa_data,WNI_CFG_BSSID_LEN); + vos_mem_copy(setKey.peerMac,ext->addr.sa_data, VOS_MAC_ADDR_SIZE); } if(ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) { setKey.keyDirection = eSIR_TX_DEFAULT; - vos_mem_copy(setKey.peerMac,ext->addr.sa_data,WNI_CFG_BSSID_LEN); + vos_mem_copy(setKey.peerMac,ext->addr.sa_data, VOS_MAC_ADDR_SIZE); } /*For supplicant pae role is zero*/ diff --git a/CORE/HDD/src/wlan_hdd_scan.c b/CORE/HDD/src/wlan_hdd_scan.c index 7c4b9f574d20..f20915456eb8 100644 --- a/CORE/HDD/src/wlan_hdd_scan.c +++ b/CORE/HDD/src/wlan_hdd_scan.c @@ -488,7 +488,7 @@ static eHalStatus hdd_IndicateScanResult(hdd_scan_info_t *scanInfo, tCsrScanResu pAdapter->sessionCtx.station.conn_info.connState ) && ( VOS_TRUE == vos_mem_compare(descriptor->bssId, pAdapter->sessionCtx.station.conn_info.bssId, - WNI_CFG_BSSID_LEN))) + VOS_MAC_ADDR_SIZE))) { event.u.qual.level = pAdapter->rssi; } diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c index 3e697ec2a447..cab8e18fd20b 100644 --- a/CORE/HDD/src/wlan_hdd_wext.c +++ b/CORE/HDD/src/wlan_hdd_wext.c @@ -1415,7 +1415,7 @@ void hdd_clearRoamProfileIe( hdd_adapter_t *pAdapter) pAdapter->wapi_info.nWapiMode = 0; #endif - vos_mem_zero((void *)(pWextState->req_bssId), WNI_CFG_BSSID_LEN); + vos_mem_zero((void *)(pWextState->req_bssId), VOS_MAC_ADDR_SIZE); } @@ -3910,7 +3910,7 @@ static int iw_set_encodeext(struct net_device *dev, struct iw_encode_ext *ext = (struct iw_encode_ext*)extra; - v_U8_t groupmacaddr[WNI_CFG_BSSID_LEN] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; + v_U8_t groupmacaddr[VOS_MAC_ADDR_SIZE] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; int key_index; struct iw_point *encoding = &wrqu->encoding; @@ -3977,12 +3977,12 @@ static int iw_set_encodeext(struct net_device *dev, if(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) { /*Key direction for group is RX only*/ setKey.keyDirection = eSIR_RX_ONLY; - vos_mem_copy(setKey.peerMac,groupmacaddr,WNI_CFG_BSSID_LEN); + vos_mem_copy(setKey.peerMac,groupmacaddr, VOS_MAC_ADDR_SIZE); } else { setKey.keyDirection = eSIR_TX_RX; - vos_mem_copy(setKey.peerMac,ext->addr.sa_data,WNI_CFG_BSSID_LEN); + vos_mem_copy(setKey.peerMac,ext->addr.sa_data, VOS_MAC_ADDR_SIZE); } /*For supplicant pae role is zero*/ @@ -7954,7 +7954,7 @@ static int iw_qcom_set_wapi_key(struct net_device *dev, struct iw_request_info * case PAIRWISE_KEY: { isConnected = hdd_connIsConnected(pHddStaCtx); - vos_mem_copy(setKey.peerMac,&pHddStaCtx->conn_info.bssId,WNI_CFG_BSSID_LEN); + vos_mem_copy(setKey.peerMac,&pHddStaCtx->conn_info.bssId, VOS_MAC_ADDR_SIZE); break; } case GROUP_KEY: diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h index e370ddf7b82a..cd9e01d0d811 100644 --- a/CORE/MAC/inc/sirApi.h +++ b/CORE/MAC/inc/sirApi.h @@ -3833,7 +3833,7 @@ typedef struct typedef struct { tSirMacSSid ssId; - tANI_U8 currAPbssid[WNI_CFG_BSSID_LEN]; + tANI_U8 currAPbssid[VOS_MAC_ADDR_SIZE]; tANI_U32 authentication; tANI_U8 encryption; tANI_U8 mcencryption; @@ -4491,7 +4491,7 @@ typedef struct sAniHandoffReq tANI_U16 msgType; // message type is same as the request type tANI_U16 msgLen; // length of the entire request tANI_U8 sessionId; - tANI_U8 bssid[WNI_CFG_BSSID_LEN]; + tANI_U8 bssid[VOS_MAC_ADDR_SIZE]; tANI_U8 channel; #ifndef QCA_WIFI_ISOC tANI_U8 handoff_src; @@ -4837,7 +4837,7 @@ typedef struct sSirChanChangeRequest tANI_U16 messageLen; tANI_U8 targetChannel; tANI_U8 cbMode; - tANI_U8 bssid[WNI_CFG_BSSID_LEN]; + tANI_U8 bssid[VOS_MAC_ADDR_SIZE]; }tSirChanChangeRequest, *tpSirChanChangeRequest; typedef struct sSirChanChangeResponse @@ -4853,7 +4853,7 @@ typedef struct sSirStartBeaconIndication tANI_U16 messageType; tANI_U16 messageLen; tANI_U8 beaconStartStatus; - tANI_U8 bssid[WNI_CFG_BSSID_LEN]; + tANI_U8 bssid[VOS_MAC_ADDR_SIZE]; }tSirStartBeaconIndication, *tpSirStartBeaconIndication; /* Message format for requesting channel switch announcement to lower layers */ @@ -4863,7 +4863,7 @@ typedef struct sSirDfsCsaIeRequest tANI_U16 msgLen; tANI_U8 targetChannel; tANI_U8 csaIeRequired; - tANI_U8 bssid[WNI_CFG_BSSID_LEN]; + tANI_U8 bssid[VOS_MAC_ADDR_SIZE]; }tSirDfsCsaIeRequest, *tpSirDfsCsaIeRequest; /* Indication from lower layer indicating the completion of first beacon send diff --git a/CORE/MAC/inc/wniCfgAp.h b/CORE/MAC/inc/wniCfgAp.h index f22f37934684..7fa62aef8fc7 100644 --- a/CORE/MAC/inc/wniCfgAp.h +++ b/CORE/MAC/inc/wniCfgAp.h @@ -1,29 +1,29 @@ /* - * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. + * + * Previously licensed under the ISC license by Qualcomm Atheros, Inc. + * + * + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + + /* + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. + */ /* * DO NOT EDIT - This file is generated automatically @@ -84,279 +84,278 @@ #define WNI_CFG_OPERATIONAL_RATE_SET 37 #define WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET 38 #define WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET 39 -#define WNI_CFG_BSSID 40 -#define WNI_CFG_LISTEN_INTERVAL 41 -#define WNI_CFG_VALID_CHANNEL_LIST 42 -#define WNI_CFG_CURRENT_CHANNEL 43 -#define WNI_CFG_DEFAULT_RATE_INDEX_5GHZ 44 -#define WNI_CFG_DEFAULT_RATE_INDEX_24GHZ 45 -#define WNI_CFG_RATE_ADAPTATION_TYPE 46 -#define WNI_CFG_FIXED_RATE 47 -#define WNI_CFG_FIXED_RATE_MULTICAST_24GHZ 48 -#define WNI_CFG_FIXED_RATE_MULTICAST_5GHZ 49 -#define WNI_CFG_RETRYRATE_POLICY 50 -#define WNI_CFG_RETRYRATE_SECONDARY 51 -#define WNI_CFG_RETRYRATE_TERTIARY 52 -#define WNI_CFG_APSD_ENABLED 53 -#define WNI_CFG_SHARED_KEY_AUTH_ENABLE 54 -#define WNI_CFG_OPEN_SYSTEM_AUTH_ENABLE 55 -#define WNI_CFG_AUTHENTICATION_TYPE 56 -#define WNI_CFG_CF_POLL_REQUEST 57 -#define WNI_CFG_PRIVACY_ENABLED 58 -#define WNI_CFG_SHORT_PREAMBLE 59 -#define WNI_CFG_SHORT_SLOT_TIME 60 -#define WNI_CFG_ACCEPT_SHORT_SLOT_ASSOC_ONLY 61 -#define WNI_CFG_QOS_ENABLED 62 -#define WNI_CFG_HCF_ENABLED 63 -#define WNI_CFG_RSN_ENABLED 64 -#define WNI_CFG_BACKGROUND_SCAN_PERIOD 65 -#define WNI_CFG_MAX_NUM_PRE_AUTH 66 -#define WNI_CFG_PREAUTH_CLNUP_TIMEOUT 67 -#define WNI_CFG_RELEASE_AID_TIMEOUT 68 -#define WNI_CFG_HEART_BEAT_THRESHOLD 69 -#define WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT 70 -#define WNI_CFG_MANUFACTURER_OUI 71 -#define WNI_CFG_MANUFACTURER_NAME 72 -#define WNI_CFG_MODEL_NUMBER 73 -#define WNI_CFG_MODEL_NAME 74 -#define WNI_CFG_MANUFACTURER_PRODUCT_NAME 75 -#define WNI_CFG_MANUFACTURER_PRODUCT_VERSION 76 -#define WNI_CFG_11D_ENABLED 77 -#define WNI_CFG_MAX_TX_POWER_2_4 78 -#define WNI_CFG_MAX_TX_POWER_5 79 -#define WNI_CFG_NETWORK_DENSITY 80 -#define WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM 81 -#define WNI_CFG_CURRENT_TX_ANTENNA 82 -#define WNI_CFG_CURRENT_RX_ANTENNA 83 -#define WNI_CFG_CURRENT_TX_POWER_LEVEL 84 -#define WNI_CFG_POWER_STATE_PER_CHAIN 85 -#define WNI_CFG_NEW_BSS_FOUND_IND 86 -#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED 87 -#define WNI_CFG_PROPRIETARY_RATES_ENABLED 88 -#define WNI_CFG_AP_NODE_NAME 89 -#define WNI_CFG_COUNTRY_CODE 90 -#define WNI_CFG_11H_ENABLED 91 -#define WNI_CFG_WT_CNF_TIMEOUT 92 -#define WNI_CFG_KEEPALIVE_TIMEOUT 93 -#define WNI_CFG_PROXIMITY 94 -#define WNI_CFG_LOG_LEVEL 95 -#define WNI_CFG_OLBC_DETECT_TIMEOUT 96 -#define WNI_CFG_PROTECTION_ENABLED 97 -#define WNI_CFG_11G_PROTECTION_ALWAYS 98 -#define WNI_CFG_FORCE_POLICY_PROTECTION 99 -#define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED 100 -#define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED 101 -#define WNI_CFG_CAL_PERIOD 102 -#define WNI_CFG_STATS_PERIOD 103 -#define WNI_CFG_CAL_CONTROL 104 -#define WNI_CFG_11G_ONLY_POLICY 105 -#define WNI_CFG_PACKET_CLASSIFICATION 106 -#define WNI_CFG_WME_ENABLED 107 -#define WNI_CFG_ADDTS_RSP_TIMEOUT 108 -#define WNI_CFG_MAX_SP_LENGTH 109 -#define WNI_CFG_KEEP_ALIVE_STA_LIMIT_THRESHOLD 110 -#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS 111 -#define WNI_CFG_WSM_ENABLED 112 -#define WNI_CFG_PROP_CAPABILITY 113 -#define WNI_CFG_EDCA_PROFILE 114 -#define WNI_CFG_EDCA_ANI_ACBK_LOCAL 115 -#define WNI_CFG_EDCA_ANI_ACBE_LOCAL 116 -#define WNI_CFG_EDCA_ANI_ACVI_LOCAL 117 -#define WNI_CFG_EDCA_ANI_ACVO_LOCAL 118 -#define WNI_CFG_EDCA_ANI_ACBK 119 -#define WNI_CFG_EDCA_ANI_ACBE 120 -#define WNI_CFG_EDCA_ANI_ACVI 121 -#define WNI_CFG_EDCA_ANI_ACVO 122 -#define WNI_CFG_EDCA_WME_ACBK_LOCAL 123 -#define WNI_CFG_EDCA_WME_ACBE_LOCAL 124 -#define WNI_CFG_EDCA_WME_ACVI_LOCAL 125 -#define WNI_CFG_EDCA_WME_ACVO_LOCAL 126 -#define WNI_CFG_EDCA_WME_ACBK 127 -#define WNI_CFG_EDCA_WME_ACBE 128 -#define WNI_CFG_EDCA_WME_ACVI 129 -#define WNI_CFG_EDCA_WME_ACVO 130 -#define WNI_CFG_EDCA_TIT_DEMO_ACBK_LOCAL 131 -#define WNI_CFG_EDCA_TIT_DEMO_ACBE_LOCAL 132 -#define WNI_CFG_EDCA_TIT_DEMO_ACVI_LOCAL 133 -#define WNI_CFG_EDCA_TIT_DEMO_ACVO_LOCAL 134 -#define WNI_CFG_EDCA_TIT_DEMO_ACBK 135 -#define WNI_CFG_EDCA_TIT_DEMO_ACBE 136 -#define WNI_CFG_EDCA_TIT_DEMO_ACVI 137 -#define WNI_CFG_EDCA_TIT_DEMO_ACVO 138 -#define WNI_CFG_RDET_FLAG 139 -#define WNI_CFG_RADAR_CHANNEL_LIST 140 -#define WNI_CFG_LOCAL_POWER_CONSTRAINT 141 -#define WNI_CFG_ADMIT_POLICY 142 -#define WNI_CFG_ADMIT_BWFACTOR 143 -#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE 144 -#define WNI_CFG_CHANNEL_BONDING_MODE 145 -#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE 146 -#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO 147 -#define WNI_CFG_DYNAMIC_THRESHOLD_ONE 148 -#define WNI_CFG_DYNAMIC_THRESHOLD_TWO 149 -#define WNI_CFG_TRIG_STA_BK_SCAN 150 -#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING 151 -#define WNI_CFG_SCAN_CONTROL_LIST 152 -#define WNI_CFG_MIMO_ENABLED 153 -#define WNI_CFG_BLOCK_ACK_ENABLED 154 -#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT 155 -#define WNI_CFG_HT_RX_STBC 156 -#define WNI_CFG_HT_CAP_INFO 157 -#define WNI_CFG_HT_AMPDU_PARAMS 158 -#define WNI_CFG_SUPPORTED_MCS_SET 159 -#define WNI_CFG_EXT_HT_CAP_INFO 160 -#define WNI_CFG_TX_BF_CAP 161 -#define WNI_CFG_AS_CAP 162 -#define WNI_CFG_HT_INFO_FIELD1 163 -#define WNI_CFG_HT_INFO_FIELD2 164 -#define WNI_CFG_HT_INFO_FIELD3 165 -#define WNI_CFG_BASIC_MCS_SET 166 -#define WNI_CFG_CURRENT_MCS_SET 167 -#define WNI_CFG_GREENFIELD_CAPABILITY 168 -#define WNI_CFG_VHT_MAX_MPDU_LENGTH 169 -#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET 170 -#define WNI_CFG_VHT_LDPC_CODING_CAP 171 -#define WNI_CFG_VHT_SHORT_GI_80MHZ 172 -#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ 173 -#define WNI_CFG_VHT_TXSTBC 174 -#define WNI_CFG_VHT_RXSTBC 175 -#define WNI_CFG_VHT_SU_BEAMFORMER_CAP 176 -#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP 177 -#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED 178 -#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS 179 -#define WNI_CFG_VHT_MU_BEAMFORMER_CAP 180 -#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP 181 -#define WNI_CFG_VHT_TXOP_PS 182 -#define WNI_CFG_VHT_HTC_VHTC_CAP 183 -#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT 184 -#define WNI_CFG_VHT_LINK_ADAPTATION_CAP 185 -#define WNI_CFG_VHT_RX_ANT_PATTERN 186 -#define WNI_CFG_VHT_TX_ANT_PATTERN 187 -#define WNI_CFG_VHT_RX_MCS_MAP 188 -#define WNI_CFG_VHT_TX_MCS_MAP 189 -#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE 190 -#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE 191 -#define WNI_CFG_VHT_CHANNEL_WIDTH 192 -#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1 193 -#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2 194 -#define WNI_CFG_VHT_BASIC_MCS_SET 195 -#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT 196 -#define WNI_CFG_VHT_SS_UNDER_UTIL 197 -#define WNI_CFG_VHT_40MHZ_UTILIZATION 198 -#define WNI_CFG_VHT_80MHZ_UTILIZATION 199 -#define WNI_CFG_VHT_160MHZ_UTILIZATION 200 -#define WNI_CFG_MAX_AMSDU_LENGTH 201 -#define WNI_CFG_MPDU_DENSITY 202 -#define WNI_CFG_NUM_BUFF_ADVERT 203 -#define WNI_CFG_MAX_RX_AMPDU_FACTOR 204 -#define WNI_CFG_SHORT_GI_20MHZ 205 -#define WNI_CFG_SHORT_GI_40MHZ 206 -#define WNI_CFG_RIFS_ENABLED 207 -#define WNI_CFG_MAX_PS_POLL 208 -#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE 209 -#define WNI_CFG_RSSI_FILTER_PERIOD 210 -#define WNI_CFG_MIN_RSSI_THRESHOLD 211 -#define WNI_CFG_NTH_BEACON_FILTER 212 -#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE 213 -#define WNI_CFG_SCAN_IN_POWERSAVE 214 -#define WNI_CFG_IGNORE_DTIM 215 -#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE 216 -#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE 217 -#define WNI_CFG_WOWLAN_DEAUTH_ENABLE 218 -#define WNI_CFG_WOWLAN_DISASSOC_ENABLE 219 -#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON 220 -#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD 221 -#define WNI_CFG_BA_TIMEOUT 222 -#define WNI_CFG_BA_THRESHOLD_HIGH 223 -#define WNI_CFG_MAX_BA_BUFFERS 224 -#define WNI_CFG_MAX_BA_SESSIONS 225 -#define WNI_CFG_BA_AUTO_SETUP 226 -#define WNI_CFG_ADDBA_REQ_DECLINE 227 -#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC 228 -#define WNI_CFG_BG_SCAN_CHANNEL_LIST 229 -#define WNI_CFG_MAX_MEDIUM_TIME 230 -#define WNI_CFG_MAX_MPDUS_IN_AMPDU 231 -#define WNI_CFG_IBSS_AUTO_BSSID 232 -#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG 233 -#define WNI_CFG_PROBE_REQ_ADDNIE_DATA 234 -#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG 235 -#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1 236 -#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2 237 -#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3 238 -#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG 239 -#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA 240 -#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG 241 -#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA 242 -#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG 243 -#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA 244 -#define WNI_CFG_WPS_ENABLE 245 -#define WNI_CFG_WPS_STATE 246 -#define WNI_CFG_WPS_PROBE_REQ_FLAG 247 -#define WNI_CFG_WPS_VERSION 248 -#define WNI_CFG_WPS_REQUEST_TYPE 249 -#define WNI_CFG_WPS_CFG_METHOD 250 -#define WNI_CFG_WPS_UUID 251 -#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY 252 -#define WNI_CFG_WPS_PIMARY_DEVICE_OUI 253 -#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY 254 -#define WNI_CFG_WPS_ASSOCIATION_STATE 255 -#define WNI_CFG_WPS_CONFIGURATION_ERROR 256 -#define WNI_CFG_WPS_DEVICE_PASSWORD_ID 257 -#define WNI_CFG_WPS_ASSOC_METHOD 258 -#define WNI_CFG_LOW_GAIN_OVERRIDE 259 -#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE 260 -#define WNI_CFG_RPE_POLLING_THRESHOLD 261 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG 262 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG 263 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG 264 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG 265 -#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS 266 -#define WNI_CFG_SINGLE_TID_RC 267 -#define WNI_CFG_RRM_ENABLED 268 -#define WNI_CFG_RRM_OPERATING_CHAN_MAX 269 -#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX 270 -#define WNI_CFG_TX_PWR_CTRL_ENABLE 271 -#define WNI_CFG_MCAST_BCAST_FILTER_SETTING 272 -#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK 273 -#define WNI_CFG_DYNAMIC_PS_POLL_VALUE 274 -#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT 275 -#define WNI_CFG_TELE_BCN_WAKEUP_EN 276 -#define WNI_CFG_TELE_BCN_TRANS_LI 277 -#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS 278 -#define WNI_CFG_TELE_BCN_MAX_LI 279 -#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS 280 -#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS 281 -#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD 282 -#define WNI_CFG_ASSOC_STA_LIMIT 283 -#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL 284 -#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL 285 -#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND 286 -#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD 287 -#define WNI_CFG_ENABLE_CLOSE_LOOP 288 -#define WNI_CFG_ENABLE_LTE_COEX 289 -#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT 290 -#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT 291 -#define WNI_CFG_ENABLE_MC_ADDR_LIST 292 -#define WNI_CFG_ENABLE_UC_FILTER 293 -#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 294 -#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED 295 -#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP 296 -#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT 297 -#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK 298 -#define WNI_CFG_TDLS_BUF_STA_ENABLED 299 -#define WNI_CFG_TDLS_PUAPSD_INACT_TIME 300 -#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD 301 -#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES 302 -#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL 303 -#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN 304 -#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR 305 -#define WNI_CFG_ANTENNA_DIVESITY 306 -#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT 307 -#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY 308 -#define WNI_CFG_CURRENT_RSSI 309 -#define WNI_CFG_RTT3_ENABLE 310 -#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL 311 -#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED 312 +#define WNI_CFG_LISTEN_INTERVAL 40 +#define WNI_CFG_VALID_CHANNEL_LIST 41 +#define WNI_CFG_CURRENT_CHANNEL 42 +#define WNI_CFG_DEFAULT_RATE_INDEX_5GHZ 43 +#define WNI_CFG_DEFAULT_RATE_INDEX_24GHZ 44 +#define WNI_CFG_RATE_ADAPTATION_TYPE 45 +#define WNI_CFG_FIXED_RATE 46 +#define WNI_CFG_FIXED_RATE_MULTICAST_24GHZ 47 +#define WNI_CFG_FIXED_RATE_MULTICAST_5GHZ 48 +#define WNI_CFG_RETRYRATE_POLICY 49 +#define WNI_CFG_RETRYRATE_SECONDARY 50 +#define WNI_CFG_RETRYRATE_TERTIARY 51 +#define WNI_CFG_APSD_ENABLED 52 +#define WNI_CFG_SHARED_KEY_AUTH_ENABLE 53 +#define WNI_CFG_OPEN_SYSTEM_AUTH_ENABLE 54 +#define WNI_CFG_AUTHENTICATION_TYPE 55 +#define WNI_CFG_CF_POLL_REQUEST 56 +#define WNI_CFG_PRIVACY_ENABLED 57 +#define WNI_CFG_SHORT_PREAMBLE 58 +#define WNI_CFG_SHORT_SLOT_TIME 59 +#define WNI_CFG_ACCEPT_SHORT_SLOT_ASSOC_ONLY 60 +#define WNI_CFG_QOS_ENABLED 61 +#define WNI_CFG_HCF_ENABLED 62 +#define WNI_CFG_RSN_ENABLED 63 +#define WNI_CFG_BACKGROUND_SCAN_PERIOD 64 +#define WNI_CFG_MAX_NUM_PRE_AUTH 65 +#define WNI_CFG_PREAUTH_CLNUP_TIMEOUT 66 +#define WNI_CFG_RELEASE_AID_TIMEOUT 67 +#define WNI_CFG_HEART_BEAT_THRESHOLD 68 +#define WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT 69 +#define WNI_CFG_MANUFACTURER_OUI 70 +#define WNI_CFG_MANUFACTURER_NAME 71 +#define WNI_CFG_MODEL_NUMBER 72 +#define WNI_CFG_MODEL_NAME 73 +#define WNI_CFG_MANUFACTURER_PRODUCT_NAME 74 +#define WNI_CFG_MANUFACTURER_PRODUCT_VERSION 75 +#define WNI_CFG_11D_ENABLED 76 +#define WNI_CFG_MAX_TX_POWER_2_4 77 +#define WNI_CFG_MAX_TX_POWER_5 78 +#define WNI_CFG_NETWORK_DENSITY 79 +#define WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM 80 +#define WNI_CFG_CURRENT_TX_ANTENNA 81 +#define WNI_CFG_CURRENT_RX_ANTENNA 82 +#define WNI_CFG_CURRENT_TX_POWER_LEVEL 83 +#define WNI_CFG_POWER_STATE_PER_CHAIN 84 +#define WNI_CFG_NEW_BSS_FOUND_IND 85 +#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED 86 +#define WNI_CFG_PROPRIETARY_RATES_ENABLED 87 +#define WNI_CFG_AP_NODE_NAME 88 +#define WNI_CFG_COUNTRY_CODE 89 +#define WNI_CFG_11H_ENABLED 90 +#define WNI_CFG_WT_CNF_TIMEOUT 91 +#define WNI_CFG_KEEPALIVE_TIMEOUT 92 +#define WNI_CFG_PROXIMITY 93 +#define WNI_CFG_LOG_LEVEL 94 +#define WNI_CFG_OLBC_DETECT_TIMEOUT 95 +#define WNI_CFG_PROTECTION_ENABLED 96 +#define WNI_CFG_11G_PROTECTION_ALWAYS 97 +#define WNI_CFG_FORCE_POLICY_PROTECTION 98 +#define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED 99 +#define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED 100 +#define WNI_CFG_CAL_PERIOD 101 +#define WNI_CFG_STATS_PERIOD 102 +#define WNI_CFG_CAL_CONTROL 103 +#define WNI_CFG_11G_ONLY_POLICY 104 +#define WNI_CFG_PACKET_CLASSIFICATION 105 +#define WNI_CFG_WME_ENABLED 106 +#define WNI_CFG_ADDTS_RSP_TIMEOUT 107 +#define WNI_CFG_MAX_SP_LENGTH 108 +#define WNI_CFG_KEEP_ALIVE_STA_LIMIT_THRESHOLD 109 +#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS 110 +#define WNI_CFG_WSM_ENABLED 111 +#define WNI_CFG_PROP_CAPABILITY 112 +#define WNI_CFG_EDCA_PROFILE 113 +#define WNI_CFG_EDCA_ANI_ACBK_LOCAL 114 +#define WNI_CFG_EDCA_ANI_ACBE_LOCAL 115 +#define WNI_CFG_EDCA_ANI_ACVI_LOCAL 116 +#define WNI_CFG_EDCA_ANI_ACVO_LOCAL 117 +#define WNI_CFG_EDCA_ANI_ACBK 118 +#define WNI_CFG_EDCA_ANI_ACBE 119 +#define WNI_CFG_EDCA_ANI_ACVI 120 +#define WNI_CFG_EDCA_ANI_ACVO 121 +#define WNI_CFG_EDCA_WME_ACBK_LOCAL 122 +#define WNI_CFG_EDCA_WME_ACBE_LOCAL 123 +#define WNI_CFG_EDCA_WME_ACVI_LOCAL 124 +#define WNI_CFG_EDCA_WME_ACVO_LOCAL 125 +#define WNI_CFG_EDCA_WME_ACBK 126 +#define WNI_CFG_EDCA_WME_ACBE 127 +#define WNI_CFG_EDCA_WME_ACVI 128 +#define WNI_CFG_EDCA_WME_ACVO 129 +#define WNI_CFG_EDCA_TIT_DEMO_ACBK_LOCAL 130 +#define WNI_CFG_EDCA_TIT_DEMO_ACBE_LOCAL 131 +#define WNI_CFG_EDCA_TIT_DEMO_ACVI_LOCAL 132 +#define WNI_CFG_EDCA_TIT_DEMO_ACVO_LOCAL 133 +#define WNI_CFG_EDCA_TIT_DEMO_ACBK 134 +#define WNI_CFG_EDCA_TIT_DEMO_ACBE 135 +#define WNI_CFG_EDCA_TIT_DEMO_ACVI 136 +#define WNI_CFG_EDCA_TIT_DEMO_ACVO 137 +#define WNI_CFG_RDET_FLAG 138 +#define WNI_CFG_RADAR_CHANNEL_LIST 139 +#define WNI_CFG_LOCAL_POWER_CONSTRAINT 140 +#define WNI_CFG_ADMIT_POLICY 141 +#define WNI_CFG_ADMIT_BWFACTOR 142 +#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE 143 +#define WNI_CFG_CHANNEL_BONDING_MODE 144 +#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE 145 +#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO 146 +#define WNI_CFG_DYNAMIC_THRESHOLD_ONE 147 +#define WNI_CFG_DYNAMIC_THRESHOLD_TWO 148 +#define WNI_CFG_TRIG_STA_BK_SCAN 149 +#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING 150 +#define WNI_CFG_SCAN_CONTROL_LIST 151 +#define WNI_CFG_MIMO_ENABLED 152 +#define WNI_CFG_BLOCK_ACK_ENABLED 153 +#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT 154 +#define WNI_CFG_HT_RX_STBC 155 +#define WNI_CFG_HT_CAP_INFO 156 +#define WNI_CFG_HT_AMPDU_PARAMS 157 +#define WNI_CFG_SUPPORTED_MCS_SET 158 +#define WNI_CFG_EXT_HT_CAP_INFO 159 +#define WNI_CFG_TX_BF_CAP 160 +#define WNI_CFG_AS_CAP 161 +#define WNI_CFG_HT_INFO_FIELD1 162 +#define WNI_CFG_HT_INFO_FIELD2 163 +#define WNI_CFG_HT_INFO_FIELD3 164 +#define WNI_CFG_BASIC_MCS_SET 165 +#define WNI_CFG_CURRENT_MCS_SET 166 +#define WNI_CFG_GREENFIELD_CAPABILITY 167 +#define WNI_CFG_VHT_MAX_MPDU_LENGTH 168 +#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET 169 +#define WNI_CFG_VHT_LDPC_CODING_CAP 170 +#define WNI_CFG_VHT_SHORT_GI_80MHZ 171 +#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ 172 +#define WNI_CFG_VHT_TXSTBC 173 +#define WNI_CFG_VHT_RXSTBC 174 +#define WNI_CFG_VHT_SU_BEAMFORMER_CAP 175 +#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP 176 +#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED 177 +#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS 178 +#define WNI_CFG_VHT_MU_BEAMFORMER_CAP 179 +#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP 180 +#define WNI_CFG_VHT_TXOP_PS 181 +#define WNI_CFG_VHT_HTC_VHTC_CAP 182 +#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT 183 +#define WNI_CFG_VHT_LINK_ADAPTATION_CAP 184 +#define WNI_CFG_VHT_RX_ANT_PATTERN 185 +#define WNI_CFG_VHT_TX_ANT_PATTERN 186 +#define WNI_CFG_VHT_RX_MCS_MAP 187 +#define WNI_CFG_VHT_TX_MCS_MAP 188 +#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE 189 +#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE 190 +#define WNI_CFG_VHT_CHANNEL_WIDTH 191 +#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1 192 +#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2 193 +#define WNI_CFG_VHT_BASIC_MCS_SET 194 +#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT 195 +#define WNI_CFG_VHT_SS_UNDER_UTIL 196 +#define WNI_CFG_VHT_40MHZ_UTILIZATION 197 +#define WNI_CFG_VHT_80MHZ_UTILIZATION 198 +#define WNI_CFG_VHT_160MHZ_UTILIZATION 199 +#define WNI_CFG_MAX_AMSDU_LENGTH 200 +#define WNI_CFG_MPDU_DENSITY 201 +#define WNI_CFG_NUM_BUFF_ADVERT 202 +#define WNI_CFG_MAX_RX_AMPDU_FACTOR 203 +#define WNI_CFG_SHORT_GI_20MHZ 204 +#define WNI_CFG_SHORT_GI_40MHZ 205 +#define WNI_CFG_RIFS_ENABLED 206 +#define WNI_CFG_MAX_PS_POLL 207 +#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE 208 +#define WNI_CFG_RSSI_FILTER_PERIOD 209 +#define WNI_CFG_MIN_RSSI_THRESHOLD 210 +#define WNI_CFG_NTH_BEACON_FILTER 211 +#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE 212 +#define WNI_CFG_SCAN_IN_POWERSAVE 213 +#define WNI_CFG_IGNORE_DTIM 214 +#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE 215 +#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE 216 +#define WNI_CFG_WOWLAN_DEAUTH_ENABLE 217 +#define WNI_CFG_WOWLAN_DISASSOC_ENABLE 218 +#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON 219 +#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD 220 +#define WNI_CFG_BA_TIMEOUT 221 +#define WNI_CFG_BA_THRESHOLD_HIGH 222 +#define WNI_CFG_MAX_BA_BUFFERS 223 +#define WNI_CFG_MAX_BA_SESSIONS 224 +#define WNI_CFG_BA_AUTO_SETUP 225 +#define WNI_CFG_ADDBA_REQ_DECLINE 226 +#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC 227 +#define WNI_CFG_BG_SCAN_CHANNEL_LIST 228 +#define WNI_CFG_MAX_MEDIUM_TIME 229 +#define WNI_CFG_MAX_MPDUS_IN_AMPDU 230 +#define WNI_CFG_IBSS_AUTO_BSSID 231 +#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG 232 +#define WNI_CFG_PROBE_REQ_ADDNIE_DATA 233 +#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG 234 +#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1 235 +#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2 236 +#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3 237 +#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG 238 +#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA 239 +#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG 240 +#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA 241 +#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG 242 +#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA 243 +#define WNI_CFG_WPS_ENABLE 244 +#define WNI_CFG_WPS_STATE 245 +#define WNI_CFG_WPS_PROBE_REQ_FLAG 246 +#define WNI_CFG_WPS_VERSION 247 +#define WNI_CFG_WPS_REQUEST_TYPE 248 +#define WNI_CFG_WPS_CFG_METHOD 249 +#define WNI_CFG_WPS_UUID 250 +#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY 251 +#define WNI_CFG_WPS_PIMARY_DEVICE_OUI 252 +#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY 253 +#define WNI_CFG_WPS_ASSOCIATION_STATE 254 +#define WNI_CFG_WPS_CONFIGURATION_ERROR 255 +#define WNI_CFG_WPS_DEVICE_PASSWORD_ID 256 +#define WNI_CFG_WPS_ASSOC_METHOD 257 +#define WNI_CFG_LOW_GAIN_OVERRIDE 258 +#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE 259 +#define WNI_CFG_RPE_POLLING_THRESHOLD 260 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG 261 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG 262 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG 263 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG 264 +#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS 265 +#define WNI_CFG_SINGLE_TID_RC 266 +#define WNI_CFG_RRM_ENABLED 267 +#define WNI_CFG_RRM_OPERATING_CHAN_MAX 268 +#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX 269 +#define WNI_CFG_TX_PWR_CTRL_ENABLE 270 +#define WNI_CFG_MCAST_BCAST_FILTER_SETTING 271 +#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK 272 +#define WNI_CFG_DYNAMIC_PS_POLL_VALUE 273 +#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT 274 +#define WNI_CFG_TELE_BCN_WAKEUP_EN 275 +#define WNI_CFG_TELE_BCN_TRANS_LI 276 +#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS 277 +#define WNI_CFG_TELE_BCN_MAX_LI 278 +#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS 279 +#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS 280 +#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD 281 +#define WNI_CFG_ASSOC_STA_LIMIT 282 +#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL 283 +#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL 284 +#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND 285 +#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD 286 +#define WNI_CFG_ENABLE_CLOSE_LOOP 287 +#define WNI_CFG_ENABLE_LTE_COEX 288 +#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT 289 +#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT 290 +#define WNI_CFG_ENABLE_MC_ADDR_LIST 291 +#define WNI_CFG_ENABLE_UC_FILTER 292 +#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 293 +#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED 294 +#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP 295 +#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT 296 +#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK 297 +#define WNI_CFG_TDLS_BUF_STA_ENABLED 298 +#define WNI_CFG_TDLS_PUAPSD_INACT_TIME 299 +#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD 300 +#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES 301 +#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL 302 +#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN 303 +#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR 304 +#define WNI_CFG_ANTENNA_DIVESITY 305 +#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT 306 +#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY 307 +#define WNI_CFG_CURRENT_RSSI 308 +#define WNI_CFG_RTT3_ENABLE 309 +#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL 310 +#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED 311 /* * String parameter lengths @@ -373,7 +372,6 @@ #define WNI_CFG_OPERATIONAL_RATE_SET_LEN 12 #define WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET_LEN 8 #define WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET_LEN 4 -#define WNI_CFG_BSSID_LEN 6 #define WNI_CFG_VALID_CHANNEL_LIST_LEN 100 #define WNI_CFG_MANUFACTURER_OUI_LEN 3 #define WNI_CFG_MANUFACTURER_NAME_LEN 65 @@ -2612,11 +2610,11 @@ #define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED_APMAX 1 #define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED_APDEF 0 -#define CFG_PARAM_MAX_NUM 313 +#define CFG_PARAM_MAX_NUM 312 #define CFG_AP_IBUF_MAX_SIZE 252 -#define CFG_AP_SBUF_MAX_SIZE 3422 +#define CFG_AP_SBUF_MAX_SIZE 3414 #define CFG_STA_IBUF_MAX_SIZE 247 -#define CFG_STA_SBUF_MAX_SIZE 3388 +#define CFG_STA_SBUF_MAX_SIZE 3380 #define CFG_SEM_MAX_NUM 19 #define CFG_STA_MAGIC_DWORD 0xbeefbeef diff --git a/CORE/MAC/inc/wniCfgSta.h b/CORE/MAC/inc/wniCfgSta.h index 5a7bb4a1890e..5411fddcb927 100644 --- a/CORE/MAC/inc/wniCfgSta.h +++ b/CORE/MAC/inc/wniCfgSta.h @@ -1,23 +1,29 @@ -/* - * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. -*/ + /* + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. + * + * Previously licensed under the ISC license by Qualcomm Atheros, Inc. + * + * + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + + /* + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. + */ /* * DO NOT EDIT - This file is generated automatically @@ -77,274 +83,273 @@ #define WNI_CFG_OPERATIONAL_RATE_SET 37 #define WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET 38 #define WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET 39 -#define WNI_CFG_BSSID 40 -#define WNI_CFG_LISTEN_INTERVAL 41 -#define WNI_CFG_VALID_CHANNEL_LIST 42 -#define WNI_CFG_CURRENT_CHANNEL 43 -#define WNI_CFG_DEFAULT_RATE_INDEX_5GHZ 44 -#define WNI_CFG_DEFAULT_RATE_INDEX_24GHZ 45 -#define WNI_CFG_RATE_ADAPTATION_TYPE 46 -#define WNI_CFG_FIXED_RATE 47 -#define WNI_CFG_FIXED_RATE_MULTICAST_24GHZ 48 -#define WNI_CFG_FIXED_RATE_MULTICAST_5GHZ 49 -#define WNI_CFG_RETRYRATE_POLICY 50 -#define WNI_CFG_RETRYRATE_SECONDARY 51 -#define WNI_CFG_RETRYRATE_TERTIARY 52 -#define WNI_CFG_APSD_ENABLED 53 -#define WNI_CFG_SHARED_KEY_AUTH_ENABLE 54 -#define WNI_CFG_OPEN_SYSTEM_AUTH_ENABLE 55 -#define WNI_CFG_AUTHENTICATION_TYPE 56 -#define WNI_CFG_PRIVACY_ENABLED 58 -#define WNI_CFG_SHORT_PREAMBLE 59 -#define WNI_CFG_SHORT_SLOT_TIME 60 -#define WNI_CFG_ACCEPT_SHORT_SLOT_ASSOC_ONLY 61 -#define WNI_CFG_QOS_ENABLED 62 -#define WNI_CFG_HCF_ENABLED 63 -#define WNI_CFG_RSN_ENABLED 64 -#define WNI_CFG_BACKGROUND_SCAN_PERIOD 65 -#define WNI_CFG_MAX_NUM_PRE_AUTH 66 -#define WNI_CFG_HEART_BEAT_THRESHOLD 69 -#define WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT 70 -#define WNI_CFG_MANUFACTURER_OUI 71 -#define WNI_CFG_MANUFACTURER_NAME 72 -#define WNI_CFG_MODEL_NUMBER 73 -#define WNI_CFG_MODEL_NAME 74 -#define WNI_CFG_MANUFACTURER_PRODUCT_NAME 75 -#define WNI_CFG_MANUFACTURER_PRODUCT_VERSION 76 -#define WNI_CFG_11D_ENABLED 77 -#define WNI_CFG_MAX_TX_POWER_2_4 78 -#define WNI_CFG_MAX_TX_POWER_5 79 -#define WNI_CFG_NETWORK_DENSITY 80 -#define WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM 81 -#define WNI_CFG_CURRENT_TX_ANTENNA 82 -#define WNI_CFG_CURRENT_RX_ANTENNA 83 -#define WNI_CFG_CURRENT_TX_POWER_LEVEL 84 -#define WNI_CFG_POWER_STATE_PER_CHAIN 85 -#define WNI_CFG_NEW_BSS_FOUND_IND 86 -#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED 87 -#define WNI_CFG_PROPRIETARY_RATES_ENABLED 88 -#define WNI_CFG_COUNTRY_CODE 90 -#define WNI_CFG_11H_ENABLED 91 -#define WNI_CFG_WT_CNF_TIMEOUT 92 -#define WNI_CFG_KEEPALIVE_TIMEOUT 93 -#define WNI_CFG_PROXIMITY 94 -#define WNI_CFG_LOG_LEVEL 95 -#define WNI_CFG_OLBC_DETECT_TIMEOUT 96 -#define WNI_CFG_PROTECTION_ENABLED 97 -#define WNI_CFG_11G_PROTECTION_ALWAYS 98 -#define WNI_CFG_FORCE_POLICY_PROTECTION 99 -#define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED 100 -#define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED 101 -#define WNI_CFG_CAL_PERIOD 102 -#define WNI_CFG_STATS_PERIOD 103 -#define WNI_CFG_CAL_CONTROL 104 -#define WNI_CFG_11G_ONLY_POLICY 105 -#define WNI_CFG_PACKET_CLASSIFICATION 106 -#define WNI_CFG_WME_ENABLED 107 -#define WNI_CFG_ADDTS_RSP_TIMEOUT 108 -#define WNI_CFG_MAX_SP_LENGTH 109 -#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS 111 -#define WNI_CFG_WSM_ENABLED 112 -#define WNI_CFG_PROP_CAPABILITY 113 -#define WNI_CFG_EDCA_PROFILE 114 -#define WNI_CFG_EDCA_ANI_ACBK_LOCAL 115 -#define WNI_CFG_EDCA_ANI_ACBE_LOCAL 116 -#define WNI_CFG_EDCA_ANI_ACVI_LOCAL 117 -#define WNI_CFG_EDCA_ANI_ACVO_LOCAL 118 -#define WNI_CFG_EDCA_ANI_ACBK 119 -#define WNI_CFG_EDCA_ANI_ACBE 120 -#define WNI_CFG_EDCA_ANI_ACVI 121 -#define WNI_CFG_EDCA_ANI_ACVO 122 -#define WNI_CFG_EDCA_WME_ACBK_LOCAL 123 -#define WNI_CFG_EDCA_WME_ACBE_LOCAL 124 -#define WNI_CFG_EDCA_WME_ACVI_LOCAL 125 -#define WNI_CFG_EDCA_WME_ACVO_LOCAL 126 -#define WNI_CFG_EDCA_WME_ACBK 127 -#define WNI_CFG_EDCA_WME_ACBE 128 -#define WNI_CFG_EDCA_WME_ACVI 129 -#define WNI_CFG_EDCA_WME_ACVO 130 -#define WNI_CFG_EDCA_TIT_DEMO_ACBK_LOCAL 131 -#define WNI_CFG_EDCA_TIT_DEMO_ACBE_LOCAL 132 -#define WNI_CFG_EDCA_TIT_DEMO_ACVI_LOCAL 133 -#define WNI_CFG_EDCA_TIT_DEMO_ACVO_LOCAL 134 -#define WNI_CFG_EDCA_TIT_DEMO_ACBK 135 -#define WNI_CFG_EDCA_TIT_DEMO_ACBE 136 -#define WNI_CFG_EDCA_TIT_DEMO_ACVI 137 -#define WNI_CFG_EDCA_TIT_DEMO_ACVO 138 -#define WNI_CFG_RDET_FLAG 139 -#define WNI_CFG_RADAR_CHANNEL_LIST 140 -#define WNI_CFG_LOCAL_POWER_CONSTRAINT 141 -#define WNI_CFG_ADMIT_POLICY 142 -#define WNI_CFG_ADMIT_BWFACTOR 143 -#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE 144 -#define WNI_CFG_CHANNEL_BONDING_MODE 145 -#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE 146 -#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO 147 -#define WNI_CFG_DYNAMIC_THRESHOLD_ONE 148 -#define WNI_CFG_DYNAMIC_THRESHOLD_TWO 149 -#define WNI_CFG_TRIG_STA_BK_SCAN 150 -#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING 151 -#define WNI_CFG_SCAN_CONTROL_LIST 152 -#define WNI_CFG_MIMO_ENABLED 153 -#define WNI_CFG_BLOCK_ACK_ENABLED 154 -#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT 155 -#define WNI_CFG_HT_RX_STBC 156 -#define WNI_CFG_HT_CAP_INFO 157 -#define WNI_CFG_HT_AMPDU_PARAMS 158 -#define WNI_CFG_SUPPORTED_MCS_SET 159 -#define WNI_CFG_EXT_HT_CAP_INFO 160 -#define WNI_CFG_TX_BF_CAP 161 -#define WNI_CFG_AS_CAP 162 -#define WNI_CFG_HT_INFO_FIELD1 163 -#define WNI_CFG_HT_INFO_FIELD2 164 -#define WNI_CFG_HT_INFO_FIELD3 165 -#define WNI_CFG_BASIC_MCS_SET 166 -#define WNI_CFG_CURRENT_MCS_SET 167 -#define WNI_CFG_GREENFIELD_CAPABILITY 168 -#define WNI_CFG_VHT_MAX_MPDU_LENGTH 169 -#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET 170 -#define WNI_CFG_VHT_LDPC_CODING_CAP 171 -#define WNI_CFG_VHT_SHORT_GI_80MHZ 172 -#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ 173 -#define WNI_CFG_VHT_TXSTBC 174 -#define WNI_CFG_VHT_RXSTBC 175 -#define WNI_CFG_VHT_SU_BEAMFORMER_CAP 176 -#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP 177 -#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED 178 -#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS 179 -#define WNI_CFG_VHT_MU_BEAMFORMER_CAP 180 -#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP 181 -#define WNI_CFG_VHT_TXOP_PS 182 -#define WNI_CFG_VHT_HTC_VHTC_CAP 183 -#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT 184 -#define WNI_CFG_VHT_LINK_ADAPTATION_CAP 185 -#define WNI_CFG_VHT_RX_ANT_PATTERN 186 -#define WNI_CFG_VHT_TX_ANT_PATTERN 187 -#define WNI_CFG_VHT_RX_MCS_MAP 188 -#define WNI_CFG_VHT_TX_MCS_MAP 189 -#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE 190 -#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE 191 -#define WNI_CFG_VHT_CHANNEL_WIDTH 192 -#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1 193 -#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2 194 -#define WNI_CFG_VHT_BASIC_MCS_SET 195 -#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT 196 -#define WNI_CFG_VHT_SS_UNDER_UTIL 197 -#define WNI_CFG_VHT_40MHZ_UTILIZATION 198 -#define WNI_CFG_VHT_80MHZ_UTILIZATION 199 -#define WNI_CFG_VHT_160MHZ_UTILIZATION 200 -#define WNI_CFG_MAX_AMSDU_LENGTH 201 -#define WNI_CFG_MPDU_DENSITY 202 -#define WNI_CFG_NUM_BUFF_ADVERT 203 -#define WNI_CFG_MAX_RX_AMPDU_FACTOR 204 -#define WNI_CFG_SHORT_GI_20MHZ 205 -#define WNI_CFG_SHORT_GI_40MHZ 206 -#define WNI_CFG_RIFS_ENABLED 207 -#define WNI_CFG_MAX_PS_POLL 208 -#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE 209 -#define WNI_CFG_RSSI_FILTER_PERIOD 210 -#define WNI_CFG_MIN_RSSI_THRESHOLD 211 -#define WNI_CFG_NTH_BEACON_FILTER 212 -#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE 213 -#define WNI_CFG_SCAN_IN_POWERSAVE 214 -#define WNI_CFG_IGNORE_DTIM 215 -#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE 216 -#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE 217 -#define WNI_CFG_WOWLAN_DEAUTH_ENABLE 218 -#define WNI_CFG_WOWLAN_DISASSOC_ENABLE 219 -#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON 220 -#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD 221 -#define WNI_CFG_BA_TIMEOUT 222 -#define WNI_CFG_BA_THRESHOLD_HIGH 223 -#define WNI_CFG_MAX_BA_BUFFERS 224 -#define WNI_CFG_MAX_BA_SESSIONS 225 -#define WNI_CFG_BA_AUTO_SETUP 226 -#define WNI_CFG_ADDBA_REQ_DECLINE 227 -#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC 228 -#define WNI_CFG_BG_SCAN_CHANNEL_LIST 229 -#define WNI_CFG_MAX_MEDIUM_TIME 230 -#define WNI_CFG_MAX_MPDUS_IN_AMPDU 231 -#define WNI_CFG_IBSS_AUTO_BSSID 232 -#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG 233 -#define WNI_CFG_PROBE_REQ_ADDNIE_DATA 234 -#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG 235 -#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1 236 -#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2 237 -#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3 238 -#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG 239 -#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA 240 -#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG 241 -#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA 242 -#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG 243 -#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA 244 -#define WNI_CFG_WPS_ENABLE 245 -#define WNI_CFG_WPS_STATE 246 -#define WNI_CFG_WPS_PROBE_REQ_FLAG 247 -#define WNI_CFG_WPS_VERSION 248 -#define WNI_CFG_WPS_REQUEST_TYPE 249 -#define WNI_CFG_WPS_CFG_METHOD 250 -#define WNI_CFG_WPS_UUID 251 -#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY 252 -#define WNI_CFG_WPS_PIMARY_DEVICE_OUI 253 -#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY 254 -#define WNI_CFG_WPS_ASSOCIATION_STATE 255 -#define WNI_CFG_WPS_CONFIGURATION_ERROR 256 -#define WNI_CFG_WPS_DEVICE_PASSWORD_ID 257 -#define WNI_CFG_WPS_ASSOC_METHOD 258 -#define WNI_CFG_LOW_GAIN_OVERRIDE 259 -#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE 260 -#define WNI_CFG_RPE_POLLING_THRESHOLD 261 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG 262 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG 263 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG 264 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG 265 -#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS 266 -#define WNI_CFG_SINGLE_TID_RC 267 -#define WNI_CFG_RRM_ENABLED 268 -#define WNI_CFG_RRM_OPERATING_CHAN_MAX 269 -#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX 270 -#define WNI_CFG_TX_PWR_CTRL_ENABLE 271 -#define WNI_CFG_MCAST_BCAST_FILTER_SETTING 272 -#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK 273 -#define WNI_CFG_DYNAMIC_PS_POLL_VALUE 274 -#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT 275 -#define WNI_CFG_TELE_BCN_WAKEUP_EN 276 -#define WNI_CFG_TELE_BCN_TRANS_LI 277 -#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS 278 -#define WNI_CFG_TELE_BCN_MAX_LI 279 -#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS 280 -#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS 281 -#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD 282 -#define WNI_CFG_ASSOC_STA_LIMIT 283 -#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL 284 -#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL 285 -#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND 286 -#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD 287 -#define WNI_CFG_ENABLE_CLOSE_LOOP 288 -#define WNI_CFG_ENABLE_LTE_COEX 289 -#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT 290 -#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT 291 -#define WNI_CFG_ENABLE_MC_ADDR_LIST 292 -#define WNI_CFG_ENABLE_UC_FILTER 293 -#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 294 -#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED 295 -#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP 296 -#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT 297 -#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK 298 -#define WNI_CFG_TDLS_BUF_STA_ENABLED 299 -#define WNI_CFG_TDLS_PUAPSD_INACT_TIME 300 -#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD 301 -#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES 302 -#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL 303 -#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN 304 -#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR 305 -#define WNI_CFG_ANTENNA_DIVESITY 306 -#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT 307 -#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY 308 -#define WNI_CFG_CURRENT_RSSI 309 -#define WNI_CFG_RTT3_ENABLE 310 -#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL 311 -#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED 312 +#define WNI_CFG_LISTEN_INTERVAL 40 +#define WNI_CFG_VALID_CHANNEL_LIST 41 +#define WNI_CFG_CURRENT_CHANNEL 42 +#define WNI_CFG_DEFAULT_RATE_INDEX_5GHZ 43 +#define WNI_CFG_DEFAULT_RATE_INDEX_24GHZ 44 +#define WNI_CFG_RATE_ADAPTATION_TYPE 45 +#define WNI_CFG_FIXED_RATE 46 +#define WNI_CFG_FIXED_RATE_MULTICAST_24GHZ 47 +#define WNI_CFG_FIXED_RATE_MULTICAST_5GHZ 48 +#define WNI_CFG_RETRYRATE_POLICY 49 +#define WNI_CFG_RETRYRATE_SECONDARY 50 +#define WNI_CFG_RETRYRATE_TERTIARY 51 +#define WNI_CFG_APSD_ENABLED 52 +#define WNI_CFG_SHARED_KEY_AUTH_ENABLE 53 +#define WNI_CFG_OPEN_SYSTEM_AUTH_ENABLE 54 +#define WNI_CFG_AUTHENTICATION_TYPE 55 +#define WNI_CFG_PRIVACY_ENABLED 57 +#define WNI_CFG_SHORT_PREAMBLE 58 +#define WNI_CFG_SHORT_SLOT_TIME 59 +#define WNI_CFG_ACCEPT_SHORT_SLOT_ASSOC_ONLY 60 +#define WNI_CFG_QOS_ENABLED 61 +#define WNI_CFG_HCF_ENABLED 62 +#define WNI_CFG_RSN_ENABLED 63 +#define WNI_CFG_BACKGROUND_SCAN_PERIOD 64 +#define WNI_CFG_MAX_NUM_PRE_AUTH 65 +#define WNI_CFG_HEART_BEAT_THRESHOLD 68 +#define WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT 69 +#define WNI_CFG_MANUFACTURER_OUI 70 +#define WNI_CFG_MANUFACTURER_NAME 71 +#define WNI_CFG_MODEL_NUMBER 72 +#define WNI_CFG_MODEL_NAME 73 +#define WNI_CFG_MANUFACTURER_PRODUCT_NAME 74 +#define WNI_CFG_MANUFACTURER_PRODUCT_VERSION 75 +#define WNI_CFG_11D_ENABLED 76 +#define WNI_CFG_MAX_TX_POWER_2_4 77 +#define WNI_CFG_MAX_TX_POWER_5 78 +#define WNI_CFG_NETWORK_DENSITY 79 +#define WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM 80 +#define WNI_CFG_CURRENT_TX_ANTENNA 81 +#define WNI_CFG_CURRENT_RX_ANTENNA 82 +#define WNI_CFG_CURRENT_TX_POWER_LEVEL 83 +#define WNI_CFG_POWER_STATE_PER_CHAIN 84 +#define WNI_CFG_NEW_BSS_FOUND_IND 85 +#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED 86 +#define WNI_CFG_PROPRIETARY_RATES_ENABLED 87 +#define WNI_CFG_COUNTRY_CODE 89 +#define WNI_CFG_11H_ENABLED 90 +#define WNI_CFG_WT_CNF_TIMEOUT 91 +#define WNI_CFG_KEEPALIVE_TIMEOUT 92 +#define WNI_CFG_PROXIMITY 93 +#define WNI_CFG_LOG_LEVEL 94 +#define WNI_CFG_OLBC_DETECT_TIMEOUT 95 +#define WNI_CFG_PROTECTION_ENABLED 96 +#define WNI_CFG_11G_PROTECTION_ALWAYS 97 +#define WNI_CFG_FORCE_POLICY_PROTECTION 98 +#define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED 99 +#define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED 100 +#define WNI_CFG_CAL_PERIOD 101 +#define WNI_CFG_STATS_PERIOD 102 +#define WNI_CFG_CAL_CONTROL 103 +#define WNI_CFG_11G_ONLY_POLICY 104 +#define WNI_CFG_PACKET_CLASSIFICATION 105 +#define WNI_CFG_WME_ENABLED 106 +#define WNI_CFG_ADDTS_RSP_TIMEOUT 107 +#define WNI_CFG_MAX_SP_LENGTH 108 +#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS 110 +#define WNI_CFG_WSM_ENABLED 111 +#define WNI_CFG_PROP_CAPABILITY 112 +#define WNI_CFG_EDCA_PROFILE 113 +#define WNI_CFG_EDCA_ANI_ACBK_LOCAL 114 +#define WNI_CFG_EDCA_ANI_ACBE_LOCAL 115 +#define WNI_CFG_EDCA_ANI_ACVI_LOCAL 116 +#define WNI_CFG_EDCA_ANI_ACVO_LOCAL 117 +#define WNI_CFG_EDCA_ANI_ACBK 118 +#define WNI_CFG_EDCA_ANI_ACBE 119 +#define WNI_CFG_EDCA_ANI_ACVI 120 +#define WNI_CFG_EDCA_ANI_ACVO 121 +#define WNI_CFG_EDCA_WME_ACBK_LOCAL 122 +#define WNI_CFG_EDCA_WME_ACBE_LOCAL 123 +#define WNI_CFG_EDCA_WME_ACVI_LOCAL 124 +#define WNI_CFG_EDCA_WME_ACVO_LOCAL 125 +#define WNI_CFG_EDCA_WME_ACBK 126 +#define WNI_CFG_EDCA_WME_ACBE 127 +#define WNI_CFG_EDCA_WME_ACVI 128 +#define WNI_CFG_EDCA_WME_ACVO 129 +#define WNI_CFG_EDCA_TIT_DEMO_ACBK_LOCAL 130 +#define WNI_CFG_EDCA_TIT_DEMO_ACBE_LOCAL 131 +#define WNI_CFG_EDCA_TIT_DEMO_ACVI_LOCAL 132 +#define WNI_CFG_EDCA_TIT_DEMO_ACVO_LOCAL 133 +#define WNI_CFG_EDCA_TIT_DEMO_ACBK 134 +#define WNI_CFG_EDCA_TIT_DEMO_ACBE 135 +#define WNI_CFG_EDCA_TIT_DEMO_ACVI 136 +#define WNI_CFG_EDCA_TIT_DEMO_ACVO 137 +#define WNI_CFG_RDET_FLAG 138 +#define WNI_CFG_RADAR_CHANNEL_LIST 139 +#define WNI_CFG_LOCAL_POWER_CONSTRAINT 140 +#define WNI_CFG_ADMIT_POLICY 141 +#define WNI_CFG_ADMIT_BWFACTOR 142 +#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE 143 +#define WNI_CFG_CHANNEL_BONDING_MODE 144 +#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE 145 +#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO 146 +#define WNI_CFG_DYNAMIC_THRESHOLD_ONE 147 +#define WNI_CFG_DYNAMIC_THRESHOLD_TWO 148 +#define WNI_CFG_TRIG_STA_BK_SCAN 149 +#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING 150 +#define WNI_CFG_SCAN_CONTROL_LIST 151 +#define WNI_CFG_MIMO_ENABLED 152 +#define WNI_CFG_BLOCK_ACK_ENABLED 153 +#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT 154 +#define WNI_CFG_HT_RX_STBC 155 +#define WNI_CFG_HT_CAP_INFO 156 +#define WNI_CFG_HT_AMPDU_PARAMS 157 +#define WNI_CFG_SUPPORTED_MCS_SET 158 +#define WNI_CFG_EXT_HT_CAP_INFO 159 +#define WNI_CFG_TX_BF_CAP 160 +#define WNI_CFG_AS_CAP 161 +#define WNI_CFG_HT_INFO_FIELD1 162 +#define WNI_CFG_HT_INFO_FIELD2 163 +#define WNI_CFG_HT_INFO_FIELD3 164 +#define WNI_CFG_BASIC_MCS_SET 165 +#define WNI_CFG_CURRENT_MCS_SET 166 +#define WNI_CFG_GREENFIELD_CAPABILITY 167 +#define WNI_CFG_VHT_MAX_MPDU_LENGTH 168 +#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET 169 +#define WNI_CFG_VHT_LDPC_CODING_CAP 170 +#define WNI_CFG_VHT_SHORT_GI_80MHZ 171 +#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ 172 +#define WNI_CFG_VHT_TXSTBC 173 +#define WNI_CFG_VHT_RXSTBC 174 +#define WNI_CFG_VHT_SU_BEAMFORMER_CAP 175 +#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP 176 +#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED 177 +#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS 178 +#define WNI_CFG_VHT_MU_BEAMFORMER_CAP 179 +#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP 180 +#define WNI_CFG_VHT_TXOP_PS 181 +#define WNI_CFG_VHT_HTC_VHTC_CAP 182 +#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT 183 +#define WNI_CFG_VHT_LINK_ADAPTATION_CAP 184 +#define WNI_CFG_VHT_RX_ANT_PATTERN 185 +#define WNI_CFG_VHT_TX_ANT_PATTERN 186 +#define WNI_CFG_VHT_RX_MCS_MAP 187 +#define WNI_CFG_VHT_TX_MCS_MAP 188 +#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE 189 +#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE 190 +#define WNI_CFG_VHT_CHANNEL_WIDTH 191 +#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1 192 +#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2 193 +#define WNI_CFG_VHT_BASIC_MCS_SET 194 +#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT 195 +#define WNI_CFG_VHT_SS_UNDER_UTIL 196 +#define WNI_CFG_VHT_40MHZ_UTILIZATION 197 +#define WNI_CFG_VHT_80MHZ_UTILIZATION 198 +#define WNI_CFG_VHT_160MHZ_UTILIZATION 199 +#define WNI_CFG_MAX_AMSDU_LENGTH 200 +#define WNI_CFG_MPDU_DENSITY 201 +#define WNI_CFG_NUM_BUFF_ADVERT 202 +#define WNI_CFG_MAX_RX_AMPDU_FACTOR 203 +#define WNI_CFG_SHORT_GI_20MHZ 204 +#define WNI_CFG_SHORT_GI_40MHZ 205 +#define WNI_CFG_RIFS_ENABLED 206 +#define WNI_CFG_MAX_PS_POLL 207 +#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE 208 +#define WNI_CFG_RSSI_FILTER_PERIOD 209 +#define WNI_CFG_MIN_RSSI_THRESHOLD 210 +#define WNI_CFG_NTH_BEACON_FILTER 211 +#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE 212 +#define WNI_CFG_SCAN_IN_POWERSAVE 213 +#define WNI_CFG_IGNORE_DTIM 214 +#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE 215 +#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE 216 +#define WNI_CFG_WOWLAN_DEAUTH_ENABLE 217 +#define WNI_CFG_WOWLAN_DISASSOC_ENABLE 218 +#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON 219 +#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD 220 +#define WNI_CFG_BA_TIMEOUT 221 +#define WNI_CFG_BA_THRESHOLD_HIGH 222 +#define WNI_CFG_MAX_BA_BUFFERS 223 +#define WNI_CFG_MAX_BA_SESSIONS 224 +#define WNI_CFG_BA_AUTO_SETUP 225 +#define WNI_CFG_ADDBA_REQ_DECLINE 226 +#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC 227 +#define WNI_CFG_BG_SCAN_CHANNEL_LIST 228 +#define WNI_CFG_MAX_MEDIUM_TIME 229 +#define WNI_CFG_MAX_MPDUS_IN_AMPDU 230 +#define WNI_CFG_IBSS_AUTO_BSSID 231 +#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG 232 +#define WNI_CFG_PROBE_REQ_ADDNIE_DATA 233 +#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG 234 +#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1 235 +#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2 236 +#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3 237 +#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG 238 +#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA 239 +#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG 240 +#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA 241 +#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG 242 +#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA 243 +#define WNI_CFG_WPS_ENABLE 244 +#define WNI_CFG_WPS_STATE 245 +#define WNI_CFG_WPS_PROBE_REQ_FLAG 246 +#define WNI_CFG_WPS_VERSION 247 +#define WNI_CFG_WPS_REQUEST_TYPE 248 +#define WNI_CFG_WPS_CFG_METHOD 249 +#define WNI_CFG_WPS_UUID 250 +#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY 251 +#define WNI_CFG_WPS_PIMARY_DEVICE_OUI 252 +#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY 253 +#define WNI_CFG_WPS_ASSOCIATION_STATE 254 +#define WNI_CFG_WPS_CONFIGURATION_ERROR 255 +#define WNI_CFG_WPS_DEVICE_PASSWORD_ID 256 +#define WNI_CFG_WPS_ASSOC_METHOD 257 +#define WNI_CFG_LOW_GAIN_OVERRIDE 258 +#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE 259 +#define WNI_CFG_RPE_POLLING_THRESHOLD 260 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG 261 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG 262 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG 263 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG 264 +#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS 265 +#define WNI_CFG_SINGLE_TID_RC 266 +#define WNI_CFG_RRM_ENABLED 267 +#define WNI_CFG_RRM_OPERATING_CHAN_MAX 268 +#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX 269 +#define WNI_CFG_TX_PWR_CTRL_ENABLE 270 +#define WNI_CFG_MCAST_BCAST_FILTER_SETTING 271 +#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK 272 +#define WNI_CFG_DYNAMIC_PS_POLL_VALUE 273 +#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT 274 +#define WNI_CFG_TELE_BCN_WAKEUP_EN 275 +#define WNI_CFG_TELE_BCN_TRANS_LI 276 +#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS 277 +#define WNI_CFG_TELE_BCN_MAX_LI 278 +#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS 279 +#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS 280 +#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD 281 +#define WNI_CFG_ASSOC_STA_LIMIT 282 +#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL 283 +#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL 284 +#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND 285 +#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD 286 +#define WNI_CFG_ENABLE_CLOSE_LOOP 287 +#define WNI_CFG_ENABLE_LTE_COEX 288 +#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT 289 +#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT 290 +#define WNI_CFG_ENABLE_MC_ADDR_LIST 291 +#define WNI_CFG_ENABLE_UC_FILTER 292 +#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 293 +#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED 294 +#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP 295 +#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT 296 +#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK 297 +#define WNI_CFG_TDLS_BUF_STA_ENABLED 298 +#define WNI_CFG_TDLS_PUAPSD_INACT_TIME 299 +#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD 300 +#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES 301 +#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL 302 +#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN 303 +#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR 304 +#define WNI_CFG_ANTENNA_DIVESITY 305 +#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT 306 +#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY 307 +#define WNI_CFG_CURRENT_RSSI 308 +#define WNI_CFG_RTT3_ENABLE 309 +#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL 310 +#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED 311 /* * String parameter lengths @@ -361,7 +366,6 @@ #define WNI_CFG_OPERATIONAL_RATE_SET_LEN 12 #define WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET_LEN 8 #define WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET_LEN 4 -#define WNI_CFG_BSSID_LEN 6 #define WNI_CFG_VALID_CHANNEL_LIST_LEN 100 #define WNI_CFG_MANUFACTURER_OUI_LEN 3 #define WNI_CFG_MANUFACTURER_NAME_LEN 65 @@ -1679,9 +1683,9 @@ #define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED_STAMAX 1 #define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED_STADEF 0 -#define CFG_PARAM_MAX_NUM 313 +#define CFG_PARAM_MAX_NUM 312 #define CFG_STA_IBUF_MAX_SIZE 247 -#define CFG_STA_SBUF_MAX_SIZE 3388 +#define CFG_STA_SBUF_MAX_SIZE 3380 #define CFG_SEM_MAX_NUM 19 #define CFG_STA_MAGIC_DWORD 0xbeefbeef diff --git a/CORE/MAC/src/cfg/cfgUtil/cfg.txt b/CORE/MAC/src/cfg/cfgUtil/cfg.txt index 357aa64fda75..fdca4815b5e5 100644 --- a/CORE/MAC/src/cfg/cfgUtil/cfg.txt +++ b/CORE/MAC/src/cfg/cfgUtil/cfg.txt @@ -673,15 +673,6 @@ NONE * In IBSS, this can be changed for coalescing, should SME go into IDLE state? * -WNI_CFG_BSSID S 6 7 -V RW NP RESTART -NONE -6 0x22 0x22 0x11 0x11 0x33 0x33 -V RW NP RESTART -NONE -6 0x22 0x22 0x11 0x11 0x33 0x33 - - * * Listen Interval * diff --git a/CORE/MAC/src/pe/lim/limAdmitControl.c b/CORE/MAC/src/pe/lim/limAdmitControl.c index 16b32fcbe5c8..dbfce8dbfe66 100644 --- a/CORE/MAC/src/pe/lim/limAdmitControl.c +++ b/CORE/MAC/src/pe/lim/limAdmitControl.c @@ -1258,14 +1258,6 @@ void limProcessHalAddTsRsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg) // Send DELTS action frame to AP // 090803: Get peer MAC addr from session -#if 0 - cfgLen = sizeof(tSirMacAddr); - if (wlan_cfgGetStr(pMac, WNI_CFG_BSSID, peerMacAddr, &cfgLen) != eSIR_SUCCESS) - { - limLog(pMac, LOGP, FL("Fail to retrieve BSSID ")); - goto end; - } -#endif //TO SUPPORT BT-AMP sirCopyMacAddr(peerMacAddr,psessionEntry->bssId); // 090803: Add the SME Session ID diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c index a2664b7d7999..86cc55e71371 100644 --- a/CORE/MAC/src/pe/lim/limAssocUtils.c +++ b/CORE/MAC/src/pe/lim/limAssocUtils.c @@ -786,16 +786,6 @@ limSendDelStaCnf(tpAniSirGlobal pMac, tSirMacAddr staDsAddr, { // Set BSSID at CFG to null tSirMacAddr nullAddr = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - #if 0 - if (cfgSetStr(pMac, WNI_CFG_BSSID, (tANI_U8 *) &nullAddr, - sizeof(tSirMacAddr)) != eSIR_SUCCESS) - { - /// Could not update BSSID at CFG. Log error. - limLog(pMac, LOGP, FL("could not update BSSID at CFG")); - - return; - } - #endif//TO SUPPORT BT-AMP sirCopyMacAddr(nullAddr,psessionEntry->bssId); @@ -1508,20 +1498,6 @@ limRestorePreReassocState(tpAniSirGlobal pMac, // 'Change' timer for future activations limDeactivateAndChangeTimer(pMac, eLIM_REASSOC_FAIL_TIMER); - // Update BSSID at CFG database - #if 0 - if (cfgSetStr(pMac, WNI_CFG_BSSID, - pMac->lim.gLimCurrentBssId, - sizeof(tSirMacAddr)) != eSIR_SUCCESS) - { - /// Could not update BSSID at CFG. Log error. - limLog(pMac, LOGP, FL("could not update BSSID at CFG")); - return; - } - #endif - - // chanNum = pMac->lim.gLimCurrentChannelId; - /* To support BT-AMP */ chanNum = psessionEntry->currentOperChannel; secChanOffset = psessionEntry->htSecondaryChannelOffset; diff --git a/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c b/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c index 23b58c5055ff..2c114a91fb15 100644 --- a/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c +++ b/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -557,15 +557,7 @@ ibss_bss_add( vos_mem_copy(psessionEntry->bssId, pHdr->bssId, sizeof(tSirMacAddr)); - #if 0 - if (cfgSetStr(pMac, WNI_CFG_BSSID, (tANI_U8 *) pHdr->bssId, sizeof(tSirMacAddr)) - != eSIR_SUCCESS) - limLog(pMac, LOGP, FL("could not update BSSID at CFG")); - #endif //TO SUPPORT BT-AMP - sirCopyMacAddr(pHdr->bssId,psessionEntry->bssId); - /* We need not use global Mac address since per seesion BSSID is available */ - //limSetBssid(pMac, pHdr->bssId); #if 0 if (wlan_cfgGetInt(pMac, WNI_CFG_BEACON_INTERVAL, &cfg) != eSIR_SUCCESS) diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c index 60061269250e..14394be3043d 100644 --- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c +++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.c @@ -1103,13 +1103,13 @@ __limProcessDelTsReq(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession pse static void __limProcessBasicMeasReq(tpAniSirGlobal pMac, tpSirMacMeasReqActionFrame pMeasReqFrame, - tSirMacAddr peerMacAddr) + tSirMacAddr peerMacAddr, tpPESession psessionEntry) { // TBD - Station shall perform basic measurements if (limSendMeasReportFrame(pMac, pMeasReqFrame, - peerMacAddr) != eSIR_SUCCESS) + peerMacAddr, psessionEntry) != eSIR_SUCCESS) { PELOGE(limLog(pMac, LOGE, FL("fail to send Basic Meas report "));) return; @@ -1140,13 +1140,13 @@ __limProcessBasicMeasReq(tpAniSirGlobal pMac, static void __limProcessCcaMeasReq(tpAniSirGlobal pMac, tpSirMacMeasReqActionFrame pMeasReqFrame, - tSirMacAddr peerMacAddr) + tSirMacAddr peerMacAddr, tpPESession psessionEntry) { // TBD - Station shall perform cca measurements if (limSendMeasReportFrame(pMac, pMeasReqFrame, - peerMacAddr) != eSIR_SUCCESS) + peerMacAddr, psessionEntry) != eSIR_SUCCESS) { PELOGE(limLog(pMac, LOGE, FL("fail to send CCA Meas report "));) return; @@ -1176,11 +1176,11 @@ __limProcessCcaMeasReq(tpAniSirGlobal pMac, static void __limProcessRpiMeasReq(tpAniSirGlobal pMac, tpSirMacMeasReqActionFrame pMeasReqFrame, - tSirMacAddr peerMacAddr) + tSirMacAddr peerMacAddr, tpPESession psessionEntry) { if (limSendMeasReportFrame(pMac, pMeasReqFrame, - peerMacAddr) != eSIR_SUCCESS) + peerMacAddr, psessionEntry) != eSIR_SUCCESS) { PELOGE(limLog(pMac, LOGE, FL("fail to send RPI Meas report "));) return; @@ -1205,7 +1205,8 @@ __limProcessRpiMeasReq(tpAniSirGlobal pMac, */ static void -__limProcessMeasurementRequestFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo) +__limProcessMeasurementRequestFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, + tpPESession psessionEntry) { tpSirMacMgmtHdr pHdr; tANI_U8 *pBody; @@ -1235,15 +1236,15 @@ __limProcessMeasurementRequestFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo) switch(pMeasReqFrame->measReqIE.measType) { case SIR_MAC_BASIC_MEASUREMENT_TYPE: - __limProcessBasicMeasReq(pMac, pMeasReqFrame, pHdr->sa); + __limProcessBasicMeasReq(pMac, pMeasReqFrame, pHdr->sa, psessionEntry); break; case SIR_MAC_CCA_MEASUREMENT_TYPE: - __limProcessCcaMeasReq(pMac, pMeasReqFrame, pHdr->sa); + __limProcessCcaMeasReq(pMac, pMeasReqFrame, pHdr->sa, psessionEntry); break; case SIR_MAC_RPI_MEASUREMENT_TYPE: - __limProcessRpiMeasReq(pMac, pMeasReqFrame, pHdr->sa); + __limProcessRpiMeasReq(pMac, pMeasReqFrame, pHdr->sa, psessionEntry); break; default: @@ -1269,7 +1270,7 @@ __limProcessMeasurementRequestFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo) */ static void -__limProcessTpcRequestFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo) +__limProcessTpcRequestFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tpPESession psessionEntry) { tpSirMacMgmtHdr pHdr; tANI_U8 *pBody; @@ -1298,7 +1299,7 @@ __limProcessTpcRequestFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo) if (limSendTpcReportFrame(pMac, pTpcReqFrame, - pHdr->sa) != eSIR_SUCCESS) + pHdr->sa, psessionEntry) != eSIR_SUCCESS) { PELOGE(limLog(pMac, LOGE, FL("fail to send TPC Report Frame. "));) return; @@ -2233,7 +2234,7 @@ limProcessActionFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession ps case SIR_MAC_ACTION_MEASURE_REQUEST_ID: if(psessionEntry->lim11hEnable) { - __limProcessMeasurementRequestFrame(pMac, pRxPacketInfo); + __limProcessMeasurementRequestFrame(pMac, pRxPacketInfo, psessionEntry); } break; @@ -2243,7 +2244,7 @@ limProcessActionFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession ps { if(psessionEntry->lim11hEnable) { - __limProcessTpcRequestFrame(pMac, pRxPacketInfo); + __limProcessTpcRequestFrame(pMac, pRxPacketInfo, psessionEntry); } } break; diff --git a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c index 09b00e676ea5..57fd8cdbe7a9 100644 --- a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c +++ b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c @@ -388,16 +388,6 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub vos_mem_free(pBeaconStruct); return; } -#if 0 - if (wlan_cfgGetStr(pMac, WNI_CFG_BSSID, currentBssId, &cfg) != - eSIR_SUCCESS) - { - /// Could not get BSSID from CFG. Log error. - limLog(pMac, LOGP, FL("could not retrieve BSSID")); - vos_mem_free(pBeaconStruct); - return; - } -#endif //TO SUPPORT BT-AMP sirCopyMacAddr(currentBssId,psessionEntry->bssId); if (subType == LIM_ASSOC) diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c index a1695399218a..48710190fa99 100644 --- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c @@ -1834,19 +1834,7 @@ limProcessMlmStartReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) #endif //TO SUPPORT BT-AMP - // Update BSSID & SSID at CFG database - #if 0 //We are not using the BSSID and SSID from the config file, instead we are reading form the session table - if (cfgSetStr(pMac, WNI_CFG_BSSID, (tANI_U8 *) pMlmStartReq->bssId, sizeof(tSirMacAddr)) - != eSIR_SUCCESS) - limLog(pMac, LOGP, FL("could not update BSSID at CFG")); - - - - vos_mem_copy( pMac->lim.gLimCurrentBssId, - pMlmStartReq->bssId, - sizeof(tSirMacAddr)); - #endif //TO SUPPORT BT-AMP - + // Update SSID at CFG database #if 0 if (cfgSetStr(pMac, WNI_CFG_SSID, (tANI_U8 *) &pMlmStartReq->ssId.ssId, pMlmStartReq->ssId.length) != eSIR_SUCCESS) @@ -2416,15 +2404,6 @@ limProcessMlmAuthReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) * adress and requested authentication algorithm is * supported. */ - #if 0 - if (wlan_cfgGetStr(pMac, WNI_CFG_BSSID, currentBssId, &cfg) != - eSIR_SUCCESS) - { - /// Could not get BSSID from CFG. Log error. - limLog(pMac, LOGP, FL("could not retrieve BSSID")); - } - #endif //To SuppoRT BT-AMP - sirCopyMacAddr(currentBssId,psessionEntry->bssId); if (((((psessionEntry->limSystemRole== eLIM_STA_ROLE) || (psessionEntry->limSystemRole == eLIM_BT_AMP_STA_ROLE)) && @@ -2607,14 +2586,6 @@ limProcessMlmAssocReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) return; } - #if 0 - if (wlan_cfgGetStr(pMac, WNI_CFG_BSSID, currentBssId, &cfg) != - eSIR_SUCCESS) - { - /// Could not get BSSID from CFG. Log error. - limLog(pMac, LOGP, FL("could not retrieve BSSID")); - } - #endif //TO SUPPORT BT-AMP sirCopyMacAddr(currentBssId,psessionEntry->bssId); if ( (psessionEntry->limSystemRole != eLIM_AP_ROLE && psessionEntry->limSystemRole != eLIM_BT_AMP_AP_ROLE) && @@ -2776,17 +2747,6 @@ limProcessMlmReassocReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) psessionEntry->limMlmState = eLIM_MLM_WT_REASSOC_RSP_STATE; MTRACE(macTrace(pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, psessionEntry->limMlmState)); -#if 0 - // Update BSSID at CFG database - if (wlan_cfgSetStr(pMac, WNI_CFG_BSSID, - pMac->lim.gLimReassocBssId, - sizeof(tSirMacAddr)) != eSIR_SUCCESS) - { - /// Could not update BSSID at CFG. Log error. - limLog(pMac, LOGP, FL("could not update BSSID at CFG")); - } -#endif //TO SUPPORT BT-AMP - /* Copy Global Reassoc ID*/ // sirCopyMacAddr(psessionEntry->reassocbssId,pMac->lim.gLimReAssocBssId); @@ -2887,14 +2847,6 @@ limProcessMlmDisassocReqNtf(tpAniSirGlobal pMac, eHalStatus suspendStatus, tANI_ psessionEntry->limSystemRole, psessionEntry->limMlmState, MAC_ADDR_ARRAY(pMlmDisassocReq->peerMacAddr)); - #if 0 - if (wlan_cfgGetStr(pMac, WNI_CFG_BSSID, currentBssId, &cfg) != - eSIR_SUCCESS) - { - /// Could not get BSSID from CFG. Log error. - limLog(pMac, LOGP, FL("could not retrieve BSSID")); - } - #endif //BT-AMP Support sirCopyMacAddr(currentBssId,psessionEntry->bssId); switch (psessionEntry->limSystemRole) @@ -3210,14 +3162,6 @@ limProcessMlmDeauthReqNtf(tpAniSirGlobal pMac, eHalStatus suspendStatus, tANI_U3 "mlmstate %d from: "MAC_ADDRESS_STR), pMlmDeauthReq->sessionId, psessionEntry->limSystemRole, psessionEntry->limMlmState, MAC_ADDR_ARRAY(pMlmDeauthReq->peerMacAddr)); - #if 0 - if (wlan_cfgGetStr(pMac, WNI_CFG_BSSID, currentBssId, &cfg) != - eSIR_SUCCESS) - { - /// Could not get BSSID from CFG. Log error. - limLog(pMac, LOGP, FL("could not retrieve BSSID")); - } - #endif //SUPPORT BT-AMP sirCopyMacAddr(currentBssId,psessionEntry->bssId); switch (psessionEntry->limSystemRole) @@ -3527,12 +3471,6 @@ tpPESession psessionEntry; pMlmSetKeysReq->numKeys ); limPrintMacAddr( pMac, pMlmSetKeysReq->peerMacAddr, LOGW ); - #if 0 - if( eSIR_SUCCESS != wlan_cfgGetStr( pMac, WNI_CFG_BSSID, currentBssId, &cfg )) { - limLog( pMac, LOGP, FL("Could not retrieve BSSID")); - return; - } - #endif //TO SUPPORT BT-AMP sirCopyMacAddr(currentBssId,psessionEntry->bssId); switch( psessionEntry->limSystemRole ) { @@ -3717,13 +3655,6 @@ tLimMlmRemoveKeyCnf mlmRemoveKeyCnf; // Hold onto the RemoveKeys request parameters pMac->lim.gpLimMlmRemoveKeyReq = (void *) pMlmRemoveKeyReq; - #if 0 - if( eSIR_SUCCESS != wlan_cfgGetStr( pMac, - WNI_CFG_BSSID, - currentBssId, - &cfg )) - limLog( pMac, LOGP, FL("Could not retrieve BSSID")); - #endif //TO-SUPPORT BT-AMP sirCopyMacAddr(currentBssId,psessionEntry->bssId); switch( psessionEntry->limSystemRole ) @@ -4085,7 +4016,6 @@ static void limProcessJoinFailureTimeout(tpAniSirGlobal pMac) { tLimMlmJoinCnf mlmJoinCnf; - tSirMacAddr bssid; tANI_U32 len; #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM //FEATURE_WLAN_DIAG_SUPPORT_LIM vos_log_rssi_pkt_type *pRssiLog = NULL; @@ -4114,14 +4044,6 @@ limProcessJoinFailureTimeout(tpAniSirGlobal pMac) { len = sizeof(tSirMacAddr); - if (wlan_cfgGetStr(pMac, WNI_CFG_BSSID, bssid, &len) != - eSIR_SUCCESS) - { - /// Could not get BSSID from CFG. Log error. - limLog(pMac, LOGP, FL("could not retrieve BSSID")); - return; - } - // 'Change' timer for future activations limDeactivateAndChangeTimer(pMac, eLIM_JOIN_FAIL_TIMER); // Change Periodic probe req timer for future activation diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c index 7bf4ecc6a07e..ce6f17f9a9e9 100644 --- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c @@ -682,15 +682,6 @@ limProcessMlmAuthCnf(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) return; } val = sizeof(tSirMacAddr); - #if 0 - if (cfgGetStr(pMac, WNI_CFG_BSSID, - pMlmAssocReq->peerMacAddr, - &val) != eSIR_SUCCESS) - { - /// Could not get BSSID from CFG. Log error. - limLog(pMac, LOGP, FL("could not retrieve BSSID")); - } - #endif //SUPPORT BT-AMP sirCopyMacAddr(pMlmAssocReq->peerMacAddr,psessionEntry->bssId); if (wlan_cfgGetInt(pMac, WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT, (tANI_U32 *) &pMlmAssocReq->assocFailureTimeout) @@ -2729,16 +2720,6 @@ limProcessStaMlmAddBssRspPreAssoc( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, tpPES FL("call to AllocateMemory failed for mlmAuthReq")); return; } - #if 0 - val = sizeof(tSirMacAddr); - if (wlan_cfgGetStr(pMac, WNI_CFG_BSSID, - pMlmAuthReq->peerMacAddr, - &val) != eSIR_SUCCESS) - { - /// Could not get BSSID from CFG. Log error. - limLog(pMac, LOGP, FL("could not retrieve BSSID")); - } - #endif //TO SUPPORT BT-AMP sirCopyMacAddr(pMlmAuthReq->peerMacAddr,psessionEntry->bssId); pMlmAuthReq->authType = authMode; diff --git a/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c b/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c index a2b7ccebd5b6..8f981ae6ac2f 100644 --- a/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c +++ b/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -244,16 +244,6 @@ limProcessProbeRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession * our Probe Request sent upon reaching * heart beat threshold */ - #if 0 - if (wlan_cfgGetStr(pMac, - WNI_CFG_BSSID, - currentBssId, - &cfg) != eSIR_SUCCESS) - { - /// Could not get BSSID from CFG. Log error. - limLog(pMac, LOGP, FL("could not retrieve BSSID")); - } - #endif //TO SUPPORT BT-AMP sirCopyMacAddr(currentBssId,psessionEntry->bssId); if ( !vos_mem_compare(currentBssId, pHdr->bssId, sizeof(tSirMacAddr)) ) diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c index 32844bf00686..2946e26261f4 100644 --- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c @@ -4067,15 +4067,6 @@ __limProcessSmeAddtsReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) return; } - #if 0 - val = sizeof(tSirMacAddr); - if (wlan_cfgGetStr(pMac, WNI_CFG_BSSID, peerMac, &val) != eSIR_SUCCESS) - { - /// Could not get BSSID from CFG. Log error. - limLog(pMac, LOGP, FL("could not retrieve BSSID")); - return; - } - #endif sirCopyMacAddr(peerMac,psessionEntry->bssId); // save the addts request diff --git a/CORE/MAC/src/pe/lim/limSecurityUtils.c b/CORE/MAC/src/pe/lim/limSecurityUtils.c index 09677d91aa7f..8195bfb7e448 100644 --- a/CORE/MAC/src/pe/lim/limSecurityUtils.c +++ b/CORE/MAC/src/pe/lim/limSecurityUtils.c @@ -463,13 +463,6 @@ limRestoreFromAuthState(tpAniSirGlobal pMac, tSirResultCodes resultCode, tANI_U1 // 'Change' timer for future activations limDeactivateAndChangeTimer(pMac, eLIM_AUTH_FAIL_TIMER); - #if 0 - if (wlan_cfgGetStr(pMac, WNI_CFG_BSSID, currentBssId, &cfg) != eSIR_SUCCESS) - { - /// Could not get BSSID from CFG. Log error. - limLog(pMac, LOGP, FL("could not retrieve BSSID")); - } - #endif //TO SUPPORT BT-AMP sirCopyMacAddr(currentBssId,sessionEntry->bssId); if (sessionEntry->limSmeState == eLIM_SME_WT_PRE_AUTH_STATE) diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c index 664859c73d83..28cd4e28f7d0 100644 --- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c +++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c @@ -1361,19 +1361,6 @@ limSendAddtsReqActionFrame(tpAniSirGlobal pMac, pMacHdr = ( tpSirMacMgmtHdr ) pFrame; - #if 0 - cfgLen = SIR_MAC_ADDR_LENGTH; - if ( eSIR_SUCCESS != wlan_cfgGetStr( pMac, WNI_CFG_BSSID, - ( tANI_U8* )pMacHdr->bssId, &cfgLen ) ) - { - limLog( pMac, LOGP, FL("Failed to retrieve WNI_CFG_BSSID whil" - "e sending an Add TS Request.") ); - palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT, - ( void* ) pFrame, ( void* ) pPacket ); - return; - } - #endif //TO SUPPORT BT-AMP - sirCopyMacAddr(pMacHdr->bssId,psessionEntry->bssId); #ifdef WLAN_FEATURE_11W @@ -2019,17 +2006,6 @@ limSendAddtsRspActionFrame(tpAniSirGlobal pMac, pMacHdr = ( tpSirMacMgmtHdr ) pFrame; - - #if 0 - if ( eSIR_SUCCESS != wlan_cfgGetStr( pMac, WNI_CFG_BSSID, - ( tANI_U8* )pMacHdr->bssId, &cfgLen ) ) - { - limLog( pMac, LOGP, FL("Failed to retrieve WNI_CFG_BSSID whil" - "e sending an Add TS Response.") ); - palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT, ( void* ) pFrame, ( void* ) pPacket ); - return; // allocated! - } - #endif //TO SUPPORT BT-AMP sirCopyMacAddr(pMacHdr->bssId,psessionEntry->bssId); #ifdef WLAN_FEATURE_11W @@ -2211,18 +2187,6 @@ limSendDeltsReqActionFrame(tpAniSirGlobal pMac, pMacHdr = ( tpSirMacMgmtHdr ) pFrame; - #if 0 - - cfgLen = SIR_MAC_ADDR_LENGTH; - if ( eSIR_SUCCESS != wlan_cfgGetStr( pMac, WNI_CFG_BSSID, - ( tANI_U8* )pMacHdr->bssId, &cfgLen ) ) - { - limLog( pMac, LOGP, FL("Failed to retrieve WNI_CFG_BSSID whil" - "e sending an Add TS Response.") ); - palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT, ( void* ) pFrame, ( void* ) pPacket ); - return; // allocated! - } - #endif //TO SUPPORT BT-AMP sirCopyMacAddr(pMacHdr->bssId, psessionEntry->bssId); #ifdef WLAN_FEATURE_11W @@ -4485,13 +4449,14 @@ limSendDeauthMgmtFrame(tpAniSirGlobal pMac, tSirRetStatus limSendMeasReportFrame(tpAniSirGlobal pMac, tpSirMacMeasReqActionFrame pMeasReqFrame, - tSirMacAddr peer) + tSirMacAddr peer, + tpPESession psessionEntry) { tDot11fMeasurementReport frm; tANI_U8 *pFrame; tSirRetStatus nSirStatus; tpSirMacMgmtHdr pMacHdr; - tANI_U32 nBytes, nPayload, nStatus, nCfg; + tANI_U32 nBytes, nPayload, nStatus; void *pPacket; eHalStatus halstatus; @@ -4570,16 +4535,7 @@ limSendMeasReportFrame(tpAniSirGlobal pMac, pMacHdr = ( tpSirMacMgmtHdr ) pFrame; - nCfg = 6; - nSirStatus = wlan_cfgGetStr( pMac, WNI_CFG_BSSID, pMacHdr->bssId, &nCfg ); - if ( eSIR_SUCCESS != nSirStatus ) - { - limLog( pMac, LOGE, FL("Failed to retrieve WNI_CFG_BSSID from" - " CFG (%d)."), - nSirStatus ); - palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT, ( void* ) pFrame, ( void* ) pPacket ); - return eSIR_FAILURE; // just allocated... - } + vos_mem_copy(pMacHdr->bssId, psessionEntry->bssId, sizeof(tSirMacAddr)); #ifdef WLAN_FEATURE_11W limSetProtectedBit(pMac, psessionEntry, peer, pMacHdr); @@ -4639,13 +4595,14 @@ limSendMeasReportFrame(tpAniSirGlobal pMac, void limSendTpcRequestFrame(tpAniSirGlobal pMac, - tSirMacAddr peer) + tSirMacAddr peer, + tpPESession psessionEntry) { tDot11fTPCRequest frm; tANI_U8 *pFrame; tSirRetStatus nSirStatus; tpSirMacMgmtHdr pMacHdr; - tANI_U32 nBytes, nPayload, nStatus, nCfg; + tANI_U32 nBytes, nPayload, nStatus; void *pPacket; eHalStatus halstatus; @@ -4699,16 +4656,7 @@ limSendTpcRequestFrame(tpAniSirGlobal pMac, pMacHdr = ( tpSirMacMgmtHdr ) pFrame; - nCfg = 6; - nSirStatus = wlan_cfgGetStr( pMac, WNI_CFG_BSSID, pMacHdr->bssId, &nCfg ); - if ( eSIR_SUCCESS != nSirStatus ) - { - limLog( pMac, LOGE, FL("Failed to retrieve WNI_CFG_BSSID from" - " CFG (%d)."), - nSirStatus ); - palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT, ( void* ) pFrame, ( void* ) pPacket ); - return; // just allocated... - } + vos_mem_copy(pMacHdr->bssId, psessionEntry->bssId, sizeof(tSirMacAddr)); #ifdef WLAN_FEATURE_11W limSetProtectedBit(pMac, psessionEntry, peer, pMacHdr); @@ -4769,13 +4717,14 @@ limSendTpcRequestFrame(tpAniSirGlobal pMac, tSirRetStatus limSendTpcReportFrame(tpAniSirGlobal pMac, tpSirMacTpcReqActionFrame pTpcReqFrame, - tSirMacAddr peer) + tSirMacAddr peer, + tpPESession psessionEntry) { tDot11fTPCReport frm; tANI_U8 *pFrame; tSirRetStatus nSirStatus; tpSirMacMgmtHdr pMacHdr; - tANI_U32 nBytes, nPayload, nStatus, nCfg; + tANI_U32 nBytes, nPayload, nStatus; void *pPacket; eHalStatus halstatus; @@ -4836,16 +4785,7 @@ limSendTpcReportFrame(tpAniSirGlobal pMac, pMacHdr = ( tpSirMacMgmtHdr ) pFrame; - nCfg = 6; - nSirStatus = wlan_cfgGetStr( pMac, WNI_CFG_BSSID, pMacHdr->bssId, &nCfg ); - if ( eSIR_SUCCESS != nSirStatus ) - { - limLog( pMac, LOGE, FL("Failed to retrieve WNI_CFG_BSSID from" - " CFG (%d)."), - nSirStatus ); - palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT, ( void* ) pFrame, ( void* ) pPacket ); - return eSIR_FAILURE; // just allocated... - } + vos_mem_copy(pMacHdr->bssId, psessionEntry->bssId, sizeof(tSirMacAddr)); #ifdef WLAN_FEATURE_11W limSetProtectedBit(pMac, psessionEntry, peer, pMacHdr); @@ -4992,21 +4932,6 @@ limSendChannelSwitchMgmtFrame(tpAniSirGlobal pMac, return eSIR_FAILURE; // just allocated... } -#if 0 - pMacHdr = ( tpSirMacMgmtHdr ) pFrame; - - nCfg = 6; - nSirStatus = wlan_cfgGetStr( pMac, WNI_CFG_BSSID, pMacHdr->bssId, &nCfg ); - if ( eSIR_SUCCESS != nSirStatus ) - { - limLog( pMac, LOGE, FL("Failed to retrieve WNI_CFG_BSSID from" - " CFG (%d)."), - nSirStatus ); - palPktFree( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT, ( void* ) pFrame, ( void* ) pPacket ); - return eSIR_FAILURE; // just allocated... - } -#endif - #ifdef WLAN_FEATURE_11W limSetProtectedBit(pMac, psessionEntry, peer, pMacHdr); #endif @@ -5456,22 +5381,6 @@ tSirRetStatus limSendAddBAReq( tpAniSirGlobal pMac, // Update A3 with the BSSID pMacHdr = ( tpSirMacMgmtHdr ) pAddBAReqBuffer; - #if 0 - cfgLen = SIR_MAC_ADDR_LENGTH; - if( eSIR_SUCCESS != cfgGetStr( pMac, - WNI_CFG_BSSID, - (tANI_U8 *) pMacHdr->bssId, - &cfgLen )) - { - limLog( pMac, LOGP, - FL( "Failed to retrieve WNI_CFG_BSSID while" - "sending an ACTION Frame" )); - - // FIXME - Need to convert to tSirRetStatus - statusCode = eSIR_FAILURE; - goto returnAfterError; - } - #endif//TO SUPPORT BT-AMP sirCopyMacAddr(pMacHdr->bssId,psessionEntry->bssId); #ifdef WLAN_FEATURE_11W @@ -5674,22 +5583,6 @@ tSirRetStatus limSendAddBARsp( tpAniSirGlobal pMac, pMacHdr = ( tpSirMacMgmtHdr ) pAddBARspBuffer; - #if 0 - cfgLen = SIR_MAC_ADDR_LENGTH; - if( eSIR_SUCCESS != wlan_cfgGetStr( pMac, - WNI_CFG_BSSID, - (tANI_U8 *) pMacHdr->bssId, - &cfgLen )) - { - limLog( pMac, LOGP, - FL( "Failed to retrieve WNI_CFG_BSSID while" - "sending an ACTION Frame" )); - - // FIXME - Need to convert to tSirRetStatus - statusCode = eSIR_FAILURE; - goto returnAfterError; - } - #endif // TO SUPPORT BT-AMP sirCopyMacAddr(pMacHdr->bssId,psessionEntry->bssId); #ifdef WLAN_FEATURE_11W @@ -5879,22 +5772,6 @@ tSirRetStatus limSendDelBAInd( tpAniSirGlobal pMac, // Update A3 with the BSSID pMacHdr = ( tpSirMacMgmtHdr ) pDelBAIndBuffer; - #if 0 - cfgLen = SIR_MAC_ADDR_LENGTH; - if( eSIR_SUCCESS != cfgGetStr( pMac, - WNI_CFG_BSSID, - (tANI_U8 *) pMacHdr->bssId, - &cfgLen )) - { - limLog( pMac, LOGP, - FL( "Failed to retrieve WNI_CFG_BSSID while" - "sending an ACTION Frame" )); - - // FIXME - Need to convert to tSirRetStatus - statusCode = eSIR_FAILURE; - goto returnAfterError; - } - #endif //TO SUPPORT BT-AMP sirCopyMacAddr(pMacHdr->bssId,psessionEntry->bssId); #ifdef WLAN_FEATURE_11W diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h index 20419ece5474..4f6f6bbc1085 100644 --- a/CORE/MAC/src/pe/lim/limTypes.h +++ b/CORE/MAC/src/pe/lim/limTypes.h @@ -786,14 +786,16 @@ void limSetOemDataReqMode(tpAniSirGlobal pMac, eHalStatus status, tANI_U32* data #ifdef ANI_SUPPORT_11H /// Function that sends Measurement Report action frame -tSirRetStatus limSendMeasReportFrame(tpAniSirGlobal, tpSirMacMeasReqActionFrame, tSirMacAddr); +tSirRetStatus limSendMeasReportFrame(tpAniSirGlobal, tpSirMacMeasReqActionFrame, + tSirMacAddr, tpPESession psessionEntry); /// Function that sends TPC Report action frame -tSirRetStatus limSendTpcReportFrame(tpAniSirGlobal, tpSirMacTpcReqActionFrame, tSirMacAddr); +tSirRetStatus limSendTpcReportFrame(tpAniSirGlobal, tpSirMacTpcReqActionFrame, tSirMacAddr, + tpPESession psessionEntry); #endif /// Function that sends TPC Request action frame -void limSendTpcRequestFrame(tpAniSirGlobal, tSirMacAddr); +void limSendTpcRequestFrame(tpAniSirGlobal, tSirMacAddr, tpPESession psessionEntry); // Function(s) to handle responses received from HAL void limProcessMlmAddBssRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ ); diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c index b1d0b587bdca..20d191f422f3 100644 --- a/CORE/MAC/src/pe/lim/limUtils.c +++ b/CORE/MAC/src/pe/lim/limUtils.c @@ -5381,14 +5381,6 @@ limValidateDeltsReq(tpAniSirGlobal pMac, tpSirDeltsReq pDeltsReq, tSirMacAddr pe pSta = dphGetHashEntry(pMac, DPH_STA_HASH_INDEX_PEER, &psessionEntry->dph.dphHashTable); val = sizeof(tSirMacAddr); - #if 0 - if (wlan_cfgGetStr(pMac, WNI_CFG_BSSID, peerMacAddr, &val) != eSIR_SUCCESS) - { - /// Could not get BSSID from CFG. Log error. - limLog(pMac, LOGP, FL("could not retrieve BSSID")); - return eSIR_FAILURE; - } - #endif// TO SUPPORT BT-AMP sirCopyMacAddr(peerMacAddr,psessionEntry->bssId); } diff --git a/CORE/SAP/src/sapModule.c b/CORE/SAP/src/sapModule.c index 0eafd7957ccf..ac81ee56db4a 100644 --- a/CORE/SAP/src/sapModule.c +++ b/CORE/SAP/src/sapModule.c @@ -1794,7 +1794,7 @@ WLANSAP_DelKeySta vos_mem_zero(&RemoveKeyInfo, sizeof(RemoveKeyInfo)); RemoveKeyInfo.encType = pRemoveKeyInfo->encType; - vos_mem_copy(RemoveKeyInfo.peerMac, pRemoveKeyInfo->peerMac, WNI_CFG_BSSID_LEN); + vos_mem_copy(RemoveKeyInfo.peerMac, pRemoveKeyInfo->peerMac, VOS_MAC_ADDR_SIZE); RemoveKeyInfo.keyId = pRemoveKeyInfo->keyId; halStatus = sme_RoamRemoveKey(hHal, pSapCtx->sessionId, &RemoveKeyInfo, &roamId); diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h index 605117f4cfb8..b4e4da609e04 100644 --- a/CORE/SME/inc/csrApi.h +++ b/CORE/SME/inc/csrApi.h @@ -146,7 +146,7 @@ typedef enum }eCsrPhyMode; -typedef tANI_U8 tCsrBssid[WNI_CFG_BSSID_LEN]; +typedef tANI_U8 tCsrBssid[VOS_MAC_ADDR_SIZE]; typedef enum { @@ -354,7 +354,7 @@ typedef struct tagCsrEseCckmIe typedef struct tagCsrScanResultFilter { - tCsrBSSIDs BSSIDs; //each bssid has a length of WNI_CFG_BSSID_LEN (6) + tCsrBSSIDs BSSIDs; //each bssid has a length of VOS_MAC_ADDR_SIZE (6) tCsrSSIDs SSIDs; tCsrChannelInfo ChannelInfo; tCsrAuthList authType; diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c index a89551ea2b30..4b6654b695a9 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c @@ -17784,7 +17784,7 @@ csrRoamChannelChangeReq( tpAniSirGlobal pMac, tCsrBssid bssid, pMsg->messageLen = sizeof(tSirChanChangeRequest); pMsg->targetChannel = targetChannel; pMsg->cbMode = cbMode; - vos_mem_copy(pMsg->bssid, bssid, WNI_CFG_BSSID_LEN); + vos_mem_copy(pMsg->bssid, bssid, VOS_MAC_ADDR_SIZE); status = palSendMBMessage(pMac->hHdd, pMsg); @@ -17813,7 +17813,7 @@ eHalStatus csrRoamStartBeaconReq( tpAniSirGlobal pMac, tCsrBssid bssid, pMsg->messageType = pal_cpu_to_be16((tANI_U16)eWNI_SME_START_BEACON_REQ); pMsg->messageLen = sizeof(tSirStartBeaconIndication); pMsg->beaconStartStatus = dfsCacWaitStatus; - vos_mem_copy(pMsg->bssid, bssid, WNI_CFG_BSSID_LEN); + vos_mem_copy(pMsg->bssid, bssid, VOS_MAC_ADDR_SIZE); status = palSendMBMessage(pMac->hHdd, pMsg); @@ -17849,7 +17849,7 @@ csrRoamSendChanSwIERequest(tpAniSirGlobal pMac, tCsrBssid bssid, pMsg->targetChannel = targetChannel; pMsg->csaIeRequired = csaIeReqd; - vos_mem_copy(pMsg->bssid, bssid, WNI_CFG_BSSID_LEN); + vos_mem_copy(pMsg->bssid, bssid, VOS_MAC_ADDR_SIZE); status = palSendMBMessage(pMac->hHdd, pMsg); diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c index a474eb6afe45..dd07cfc82be8 100644 --- a/CORE/SME/src/csr/csrApiScan.c +++ b/CORE/SME/src/csr/csrApiScan.c @@ -2862,7 +2862,7 @@ eHalStatus csrAddPMKIDCandidateList( tpAniSirGlobal pMac, tANI_U32 sessionId, // if yes, then add to PMKIDCandidateList vos_mem_copy(pSession->PmkidCandidateInfo[pSession->NumPmkidCandidate].BSSID, - pBssDesc->bssId, WNI_CFG_BSSID_LEN); + pBssDesc->bssId, VOS_MAC_ADDR_SIZE); // Bit 0 offirst byte - PreAuthentication Capability if ( (pIes->RSN.RSN_Cap[0] >> 0) & 0x1 ) { @@ -2953,7 +2953,7 @@ eHalStatus csrAddBKIDCandidateList( tpAniSirGlobal pMac, tANI_U32 sessionId, // if yes, then add to BKIDCandidateList vos_mem_copy(pSession->BkidCandidateInfo[pSession->NumBkidCandidate].BSSID, - pBssDesc->bssId, WNI_CFG_BSSID_LEN); + pBssDesc->bssId, VOS_MAC_ADDR_SIZE); if ( pIes->WAPI.preauth ) { pSession->BkidCandidateInfo[pSession->NumBkidCandidate].preAuthSupported @@ -5128,7 +5128,7 @@ static tANI_BOOLEAN csrScanProcessScanResults( tpAniSirGlobal pMac, tSmeCmd *pCo tANI_BOOLEAN csrScanIsWildCardScan( tpAniSirGlobal pMac, tSmeCmd *pCommand ) { - tANI_U8 bssid[WNI_CFG_BSSID_LEN] = {0, 0, 0, 0, 0, 0}; + tANI_U8 bssid[VOS_MAC_ADDR_SIZE] = {0, 0, 0, 0, 0, 0}; tANI_BOOLEAN f = vos_mem_compare(pCommand->u.scanCmd.u.scanRequest.bssid, bssid, sizeof(tCsrBssid)); @@ -5520,12 +5520,12 @@ eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId, eHalStatus status = eHAL_STATUS_SUCCESS; tSirSmeScanReq *pMsg; tANI_U16 msgLen; - tANI_U8 bssid[WNI_CFG_BSSID_LEN] = {0, 0, 0, 0, 0, 0}; + tANI_U8 bssid[VOS_MAC_ADDR_SIZE] = {0, 0, 0, 0, 0, 0}; tSirScanType scanType = pScanReq->scanType; tANI_U32 minChnTime; //in units of milliseconds tANI_U32 maxChnTime; //in units of milliseconds tANI_U32 i; - tANI_U8 selfMacAddr[WNI_CFG_BSSID_LEN]; + tANI_U8 selfMacAddr[VOS_MAC_ADDR_SIZE]; tANI_U8 *pSelfMac = NULL; msgLen = (tANI_U16)(sizeof( tSirSmeScanReq ) - sizeof( pMsg->channelList.channelNumber ) + @@ -5578,11 +5578,11 @@ eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId, } if( CSR_ROAM_SESSION_MAX == i ) { - tANI_U32 len = WNI_CFG_BSSID_LEN; + tANI_U32 len = VOS_MAC_ADDR_SIZE; pSelfMac = selfMacAddr; status = ccmCfgGetStr( pMac, WNI_CFG_STA_ID, pSelfMac, &len ); if( !HAL_STATUS_SUCCESS( status ) || - ( len < WNI_CFG_BSSID_LEN ) ) + ( len < VOS_MAC_ADDR_SIZE ) ) { smsLog( pMac, LOGE, FL(" Can not get self MAC address from CFG status = %d"), status ); //Force failed status @@ -5601,7 +5601,7 @@ eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId, } else { - vos_mem_copy(pMsg->bssId, pScanReq->bssid, WNI_CFG_BSSID_LEN); + vos_mem_copy(pMsg->bssId, pScanReq->bssid, VOS_MAC_ADDR_SIZE); } minChnTime = pScanReq->minChnTime; maxChnTime = pScanReq->maxChnTime; diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c index 1e9a3dbc22e2..78a9d4440409 100644 --- a/CORE/SME/src/csr/csrUtil.c +++ b/CORE/SME/src/csr/csrUtil.c @@ -5249,17 +5249,17 @@ tANI_BOOLEAN csrIsSsidInList( tHalHandle hHal, tSirMacSSid *pSsid, tCsrSSIDs *pS //like to use sirCompareMacAddr tANI_BOOLEAN csrIsMacAddressZero( tpAniSirGlobal pMac, tCsrBssid *pMacAddr ) { - tANI_U8 bssid[WNI_CFG_BSSID_LEN] = {0, 0, 0, 0, 0, 0}; + tANI_U8 bssid[VOS_MAC_ADDR_SIZE] = {0, 0, 0, 0, 0, 0}; - return (vos_mem_compare(bssid, pMacAddr, WNI_CFG_BSSID_LEN)); + return (vos_mem_compare(bssid, pMacAddr, VOS_MAC_ADDR_SIZE)); } //like to use sirCompareMacAddr tANI_BOOLEAN csrIsMacAddressBroadcast( tpAniSirGlobal pMac, tCsrBssid *pMacAddr ) { - tANI_U8 bssid[WNI_CFG_BSSID_LEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + tANI_U8 bssid[VOS_MAC_ADDR_SIZE] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - return(vos_mem_compare(bssid, pMacAddr, WNI_CFG_BSSID_LEN)); + return(vos_mem_compare(bssid, pMacAddr, VOS_MAC_ADDR_SIZE)); } diff --git a/firmware_bin/WCNSS_cfg.dat b/firmware_bin/WCNSS_cfg.dat Binary files differindex db1a81ec8b98..024cc49500a7 100755 --- a/firmware_bin/WCNSS_cfg.dat +++ b/firmware_bin/WCNSS_cfg.dat |