samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirTdlsAddSta Req/Rsp

Browse Source 
Replace tSirMacAddr with cdf_mac_addr in tSirTdlsAddSta Req/Rsp.

Change-Id: Ie10b69ce99645f7ace3d772dc8c8de87ad86f2bc
CRs-Fixed: 898864
This commit is contained in:
Srinivas Girigowda
2015-11-19 19:38:00 -08:00
committed by Satish Singh
parent 84f4292b85
commit a35f10958e
4 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/mac/inc/sir_api.h
View File

@@ -3351,9 +3351,9 @@ typedef struct sSirTdlsAddStaReq {
uint8_t sessionId; /* Session ID */ uint8_t sessionId; /* Session ID */
uint16_t transactionId; /* Transaction ID for cmd */ uint16_t transactionId; /* Transaction ID for cmd */
/* For multi-session, for PE to locate peSession ID */ /* For multi-session, for PE to locate peSession ID */
tSirMacAddr bssid; struct cdf_mac_addr bssid;
eTdlsAddOper tdlsAddOper; eTdlsAddOper tdlsAddOper;
tSirMacAddr peerMac; struct cdf_mac_addr peermac;
uint16_t capability; uint16_t capability;
uint8_t extn_capability[SIR_MAC_MAX_EXTN_CAP]; uint8_t extn_capability[SIR_MAC_MAX_EXTN_CAP];
uint8_t supported_rates_length; uint8_t supported_rates_length;
@@ -3371,7 +3371,7 @@ typedef struct sSirTdlsAddStaRsp {
uint16_t messageType; uint16_t messageType;
uint16_t length; uint16_t length;
tSirResultCodes statusCode; tSirResultCodes statusCode;
tSirMacAddr peerMac; struct cdf_mac_addr peermac;
uint8_t sessionId; /* Session ID */ uint8_t sessionId; /* Session ID */
uint16_t staId; uint16_t staId;
uint16_t staType; uint16_t staType;

21
core/mac/src/pe/lim/lim_process_tdls.c
View File

@@ -2379,7 +2379,7 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac,
tSirRetStatus status = eSIR_SUCCESS; tSirRetStatus status = eSIR_SUCCESS;
uint16_t aid = 0; uint16_t aid = 0;
pStaDs = dph_lookup_hash_entry(pMac, pAddStaReq->peerMac, &aid, pStaDs = dph_lookup_hash_entry(pMac, pAddStaReq->peermac.bytes, &aid,
&psessionEntry->dph.dphHashTable); &psessionEntry->dph.dphHashTable);
if (NULL == pStaDs) { if (NULL == pStaDs) {
aid = lim_assign_peer_idx(pMac, psessionEntry); aid = lim_assign_peer_idx(pMac, psessionEntry);
@@ -2388,7 +2388,7 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac,
lim_log(pMac, LOGE, lim_log(pMac, LOGE,
FL("No more free AID for peer " FL("No more free AID for peer "
MAC_ADDRESS_STR), MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(pAddStaReq->peerMac)); MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
return eSIR_FAILURE; return eSIR_FAILURE;
} }
@@ -2396,7 +2396,7 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac,
SET_PEER_AID_BITMAP(psessionEntry->peerAIDBitmap, aid); SET_PEER_AID_BITMAP(psessionEntry->peerAIDBitmap, aid);
lim_log(pMac, LOG1, FL("Aid = %d, for peer =" MAC_ADDRESS_STR), lim_log(pMac, LOG1, FL("Aid = %d, for peer =" MAC_ADDRESS_STR),
aid, MAC_ADDR_ARRAY(pAddStaReq->peerMac)); aid, MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
pStaDs = pStaDs =
dph_get_hash_entry(pMac, aid, dph_get_hash_entry(pMac, aid,
&psessionEntry->dph.dphHashTable); &psessionEntry->dph.dphHashTable);
@@ -2408,8 +2408,8 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac,
psessionEntry); psessionEntry);
} }
pStaDs = dph_add_hash_entry(pMac, pAddStaReq->peerMac, aid, pStaDs = dph_add_hash_entry(pMac, pAddStaReq->peermac.bytes,
&psessionEntry->dph.dphHashTable); aid, &psessionEntry->dph.dphHashTable);
if (NULL == pStaDs) { if (NULL == pStaDs) {
lim_log(pMac, LOGE, FL("add hash entry failed")); lim_log(pMac, LOGE, FL("add hash entry failed"));
@@ -2490,8 +2490,8 @@ static CDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac,
addStaRsp->bcastSig = pStaDs->ucBcastSig; addStaRsp->bcastSig = pStaDs->ucBcastSig;
} }
if (peerMac) { if (peerMac) {
cdf_mem_copy(addStaRsp->peerMac, cdf_mem_copy(addStaRsp->peermac.bytes,
(uint8_t *) peerMac, sizeof(tSirMacAddr)); (uint8_t *) peerMac, CDF_MAC_ADDR_SIZE);
} }
if (updateSta) if (updateSta)
addStaRsp->tdlsAddOper = TDLS_OPER_UPDATE; addStaRsp->tdlsAddOper = TDLS_OPER_UPDATE;
@@ -2506,7 +2506,6 @@ static CDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac,
lim_sys_process_mmh_msg_api(pMac, &mmhMsg, ePROT); lim_sys_process_mmh_msg_api(pMac, &mmhMsg, ePROT);
return CDF_STATUS_SUCCESS; return CDF_STATUS_SUCCESS;
} }
/* /*
@@ -2921,7 +2920,8 @@ tSirRetStatus lim_process_sme_tdls_add_sta_req(tpAniSirGlobal pMac,
lim_log(pMac, LOG1, FL("TDLS Add STA Request Recieved")); lim_log(pMac, LOG1, FL("TDLS Add STA Request Recieved"));
psessionEntry = psessionEntry =
pe_find_session_by_bssid(pMac, pAddStaReq->bssid, &sessionId); pe_find_session_by_bssid(pMac, pAddStaReq->bssid.bytes,
&sessionId);
if (psessionEntry == NULL) { if (psessionEntry == NULL) {
lim_log(pMac, LOGE, lim_log(pMac, LOGE,
FL( FL(
@@ -2963,7 +2963,8 @@ tSirRetStatus lim_process_sme_tdls_add_sta_req(tpAniSirGlobal pMac,
return eSIR_SUCCESS; return eSIR_SUCCESS;
lim_tdls_add_sta_error: lim_tdls_add_sta_error:
lim_send_sme_tdls_add_sta_rsp(pMac, lim_send_sme_tdls_add_sta_rsp(pMac,
pAddStaReq->sessionId, pAddStaReq->peerMac, pAddStaReq->sessionId,
pAddStaReq->peermac.bytes,
(pAddStaReq->tdlsAddOper == TDLS_OPER_UPDATE), (pAddStaReq->tdlsAddOper == TDLS_OPER_UPDATE),
NULL, eSIR_FAILURE); NULL, eSIR_FAILURE);

4
core/sme/inc/sme_inside.h
View File

@@ -123,7 +123,7 @@ typedef struct TdlsLinkEstablishInfo {
typedef struct TdlsAddStaInfo { typedef struct TdlsAddStaInfo {
eTdlsAddOper tdlsAddOper; eTdlsAddOper tdlsAddOper;
tSirMacAddr peerMac; struct cdf_mac_addr peermac;
uint16_t capability; uint16_t capability;
uint8_t extnCapability[SIR_MAC_MAX_EXTN_CAP]; uint8_t extnCapability[SIR_MAC_MAX_EXTN_CAP];
uint8_t supportedRatesLen; uint8_t supportedRatesLen;
@@ -137,7 +137,7 @@ typedef struct TdlsAddStaInfo {
} tTdlsAddStaCmdInfo; } tTdlsAddStaCmdInfo;
typedef struct TdlsDelStaInfo { typedef struct TdlsDelStaInfo {
tSirMacAddr peerMac; struct cdf_mac_addr peermac;
} tTdlsDelStaCmdInfo; } tTdlsDelStaCmdInfo;
/* /*
* TDLS cmd info, CMD from SME to PE. * TDLS cmd info, CMD from SME to PE.

29
core/sme/src/csr/csr_tdls_process.c
View File

@@ -158,8 +158,8 @@ CDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId,
tdlsAddStaCmd->sessionId = sessionId; tdlsAddStaCmd->sessionId = sessionId;
cdf_mem_copy(tdlsAddStaCmdInfo->peerMac, cdf_mem_copy(tdlsAddStaCmdInfo->peermac.bytes,
peerMac, sizeof(tSirMacAddr)); peerMac, CDF_MAC_ADDR_SIZE);
tdlsAddStaCmdInfo->capability = pstaParams->capability; tdlsAddStaCmdInfo->capability = pstaParams->capability;
tdlsAddStaCmdInfo->uapsdQueues = tdlsAddStaCmdInfo->uapsdQueues =
pstaParams->uapsd_queues; pstaParams->uapsd_queues;
@@ -300,8 +300,8 @@ CDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId,
tdlsAddStaCmd->sessionId = sessionId; tdlsAddStaCmd->sessionId = sessionId;
tdlsAddStaCmdInfo->tdlsAddOper = TDLS_OPER_ADD; tdlsAddStaCmdInfo->tdlsAddOper = TDLS_OPER_ADD;
cdf_mem_copy(tdlsAddStaCmdInfo->peerMac, cdf_mem_copy(tdlsAddStaCmdInfo->peermac.bytes,
peerMac, sizeof(tSirMacAddr)); peerMac, CDF_MAC_ADDR_SIZE);
tdlsAddStaCmd->command = eSmeCommandTdlsAddPeer; tdlsAddStaCmd->command = eSmeCommandTdlsAddPeer;
tdlsAddStaCmd->u.tdlsCmd.size = tdlsAddStaCmd->u.tdlsCmd.size =
@@ -336,8 +336,8 @@ CDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId,
tdlsDelStaCmd->sessionId = sessionId; tdlsDelStaCmd->sessionId = sessionId;
cdf_mem_copy(tdlsDelStaCmdInfo->peerMac, cdf_mem_copy(tdlsDelStaCmdInfo->peermac.bytes,
peerMac, sizeof(tSirMacAddr)); peerMac, CDF_MAC_ADDR_SIZE);
tdlsDelStaCmd->command = eSmeCommandTdlsDelPeer; tdlsDelStaCmd->command = eSmeCommandTdlsDelPeer;
tdlsDelStaCmd->u.tdlsCmd.size = tdlsDelStaCmd->u.tdlsCmd.size =
@@ -475,11 +475,11 @@ CDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd)
/* Using dialog as transactionId. This can be used to match response with request */ /* Using dialog as transactionId. This can be used to match response with request */
tdlsAddStaReq->transactionId = 0; tdlsAddStaReq->transactionId = 0;
cdf_mem_copy(tdlsAddStaReq->bssid, cdf_mem_copy(tdlsAddStaReq->bssid.bytes,
pSession->pConnectBssDesc->bssId, sizeof(tSirMacAddr)); pSession->pConnectBssDesc->bssId, CDF_MAC_ADDR_SIZE);
cdf_mem_copy(tdlsAddStaReq->peerMac, cdf_copy_macaddr(&tdlsAddStaReq->peermac,
tdlsAddStaCmdInfo->peerMac, sizeof(tSirMacAddr)); &tdlsAddStaCmdInfo->peermac);
tdlsAddStaReq->capability = tdlsAddStaCmdInfo->capability; tdlsAddStaReq->capability = tdlsAddStaCmdInfo->capability;
tdlsAddStaReq->uapsd_queues = tdlsAddStaCmdInfo->uapsdQueues; tdlsAddStaReq->uapsd_queues = tdlsAddStaCmdInfo->uapsdQueues;
@@ -548,13 +548,13 @@ CDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd)
cdf_mem_copy(tdlsDelStaReq->bssid.bytes, cdf_mem_copy(tdlsDelStaReq->bssid.bytes,
pSession->pConnectBssDesc->bssId, CDF_MAC_ADDR_SIZE); pSession->pConnectBssDesc->bssId, CDF_MAC_ADDR_SIZE);
cdf_mem_copy(tdlsDelStaReq->peermac.bytes, cdf_copy_macaddr(&tdlsDelStaReq->peermac,
tdlsDelStaCmdInfo->peerMac, CDF_MAC_ADDR_SIZE); &tdlsDelStaCmdInfo->peermac);
/* Send the request to PE. */ /* Send the request to PE. */
sms_log(pMac, LOG1, sms_log(pMac, LOG1,
"sending TDLS Del Sta " MAC_ADDRESS_STR " req to PE", "sending TDLS Del Sta " MAC_ADDRESS_STR " req to PE",
MAC_ADDR_ARRAY(tdlsDelStaCmdInfo->peerMac)); MAC_ADDR_ARRAY(tdlsDelStaCmdInfo->peermac.bytes));
status = tdls_send_message(pMac, eWNI_SME_TDLS_DEL_STA_REQ, status = tdls_send_message(pMac, eWNI_SME_TDLS_DEL_STA_REQ,
(void *)tdlsDelStaReq, (void *)tdlsDelStaReq,
sizeof(tSirTdlsDelStaReq)); sizeof(tSirTdlsDelStaReq));
@@ -695,8 +695,7 @@ CDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType,
csr_tdls_remove_sme_cmd(pMac, eSmeCommandTdlsSendMgmt); csr_tdls_remove_sme_cmd(pMac, eSmeCommandTdlsSendMgmt);
break; break;
case eWNI_SME_TDLS_ADD_STA_RSP: case eWNI_SME_TDLS_ADD_STA_RSP:
cdf_mem_copy(&roamInfo.peerMac, addStaRsp->peerMac, cdf_copy_macaddr(&roamInfo.peerMac, &addStaRsp->peermac);
sizeof(tSirMacAddr));
roamInfo.staId = addStaRsp->staId; roamInfo.staId = addStaRsp->staId;
roamInfo.ucastSig = addStaRsp->ucastSig; roamInfo.ucastSig = addStaRsp->ucastSig;
roamInfo.bcastSig = addStaRsp->bcastSig; roamInfo.bcastSig = addStaRsp->bcastSig;