A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Replace tSirMacAddr with cdf_mac_addr in tSirTdlsLinkEstablish Req/Rsp.

Change-Id: I089e9835e08aa029b25113f260b4ba3088599075
CRs-Fixed: 898864
This commit is contained in:
Srinivas Girigowda 2015-11-20 20:58:13 -08:00 • committed by Satish Singh
commit 2e60287b81
5 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3387,8 +3387,8 @@ typedef struct {
uint8_t isOffChannelSupported;
uint8_t isResponder; /* Is Peer a responder. */
/* For multi-session, for PE to locate peSession ID */
tSirMacAddr bssid;
tSirMacAddr peerMac;
struct cdf_mac_addr bssid;
struct cdf_mac_addr peermac;
uint8_t supportedChannelsLen;
uint8_t supportedChannels[SIR_MAC_MAX_SUPP_CHANNELS];
uint8_t supportedOperClassesLen;
@ -3402,7 +3402,7 @@ typedef struct {
uint8_t sessionId; /* Session ID */
uint16_t transactionId; /* Transaction ID for cmd */
tSirResultCodes statusCode;
tSirMacAddr peerMac;
struct cdf_mac_addr peermac;
} tSirTdlsLinkEstablishReqRsp, *tpSirTdlsLinkEstablishReqRsp;
/* TDLS Request struct SME-->PE */

19
core/mac/src/pe/lim/lim_process_tdls.c
View file

@ -2842,7 +2842,8 @@ lim_tdls_send_mgmt_error:
* Send Response to Link Establish Request to SME
*/
void lim_send_sme_tdls_link_establish_req_rsp(tpAniSirGlobal pMac,
uint8_t sessionId, tSirMacAddr peerMac,
uint8_t sessionId,
struct cdf_mac_addr *peermac,
tDphHashNode *pStaDs, uint8_t status)
{
tSirMsgQ mmhMsg = { 0 };
@ -2856,10 +2857,9 @@ void lim_send_sme_tdls_link_establish_req_rsp(tpAniSirGlobal pMac,
return;
}
pTdlsLinkEstablishReqRsp->statusCode = status;
if (peerMac) {
cdf_mem_copy(pTdlsLinkEstablishReqRsp->peerMac, peerMac,
sizeof(tSirMacAddr));
}
if (peermac)
cdf_copy_macaddr(&pTdlsLinkEstablishReqRsp->peermac, peermac);
pTdlsLinkEstablishReqRsp->sessionId = sessionId;
mmhMsg.type = eWNI_SME_TDLS_LINK_ESTABLISH_RSP;
mmhMsg.bodyptr = pTdlsLinkEstablishReqRsp;
@ -3101,14 +3101,14 @@ tSirRetStatus lim_process_sme_tdls_link_establish_req(tpAniSirGlobal mac_ctx,
CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
FL("Send Mgmt Recieved"));
session_entry = pe_find_session_by_bssid(mac_ctx, tdls_req->bssid,
session_entry = pe_find_session_by_bssid(mac_ctx, tdls_req->bssid.bytes,
&session_id);
if (NULL == session_entry) {
CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
FL("PE Session does not exist for sme session_id %d"),
tdls_req->sessionId);
lim_send_sme_tdls_link_establish_req_rsp(mac_ctx,
tdls_req->sessionId, tdls_req->peerMac, NULL,
tdls_req->sessionId, &tdls_req->peermac, NULL,
eSIR_FAILURE);
return eSIR_FAILURE;
}
@ -3133,7 +3133,8 @@ tSirRetStatus lim_process_sme_tdls_link_establish_req(tpAniSirGlobal mac_ctx,
goto lim_tdls_link_establish_error;
}
stads = dph_lookup_hash_entry(mac_ctx, tdls_req->peerMac, &peer_idx,
stads = dph_lookup_hash_entry(mac_ctx, tdls_req->peermac.bytes,
&peer_idx,
&session_entry->dph.dphHashTable);
if (NULL == stads) {
lim_log(mac_ctx, LOGE, FL("stads is NULL"));
@ -3207,7 +3208,7 @@ send_tdls_establish_request:
lim_tdls_link_establish_error:
lim_send_sme_tdls_link_establish_req_rsp(mac_ctx,
session_entry->smeSessionId, tdls_req->peerMac, NULL,
session_entry->smeSessionId, &tdls_req->peermac, NULL,
eSIR_FAILURE);
return eSIR_SUCCESS;

2
core/mac/src/pe/lim/lim_send_sme_rsp_messages.h
View file

@ -109,7 +109,7 @@ void lim_send_sme_max_assoc_exceeded_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMa
uint8_t smesessionId);
#ifdef FEATURE_WLAN_TDLS
void lim_send_sme_tdls_link_establish_req_rsp(tpAniSirGlobal pMac, uint8_t sessionId,
tSirMacAddr peerMac,
struct cdf_mac_addr *peermac,
tDphHashNode *pStaDs, uint8_t status);
void lim_send_sme_tdls_event_notify(tpAniSirGlobal pMac, uint16_t msgType,
void *events);

2
core/sme/inc/sme_inside.h
View file

@ -105,7 +105,7 @@ typedef struct TdlsSendMgmtInfo {
} tTdlsSendMgmtCmdInfo;
typedef struct TdlsLinkEstablishInfo {
tSirMacAddr peerMac;
struct cdf_mac_addr peermac;
uint8_t uapsdQueues;
uint8_t maxSp;
uint8_t isBufSta;

12
core/sme/src/csr/csr_tdls_process.c
View file

@ -232,8 +232,8 @@ CDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal,
tdlsLinkEstablishCmd->sessionId = sessionId;
cdf_mem_copy(tdlsLinkEstablishCmdInfo->peerMac,
peerMac, sizeof(tSirMacAddr));
cdf_mem_copy(tdlsLinkEstablishCmdInfo->peermac.bytes,
peerMac, CDF_MAC_ADDR_SIZE);
tdlsLinkEstablishCmdInfo->isBufSta =
tdlsLinkEstablishParams->isBufSta;
tdlsLinkEstablishCmdInfo->isResponder =
@ -637,10 +637,10 @@ CDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd)
tdlsLinkEstablishReq->sessionId = cmd->sessionId;
/* Using dialog as transactionId. This can be used to match response with request */
tdlsLinkEstablishReq->transactionId = 0;
cdf_mem_copy(tdlsLinkEstablishReq->peerMac,
tdlsLinkEstablishCmdInfo->peerMac, sizeof(tSirMacAddr));
cdf_mem_copy(tdlsLinkEstablishReq->bssid,
pSession->pConnectBssDesc->bssId, sizeof(tSirMacAddr));
cdf_copy_macaddr(&tdlsLinkEstablishReq->peermac,
&tdlsLinkEstablishCmdInfo->peermac);
cdf_mem_copy(tdlsLinkEstablishReq->bssid.bytes,
pSession->pConnectBssDesc->bssId, CDF_MAC_ADDR_SIZE);
cdf_mem_copy(tdlsLinkEstablishReq->supportedChannels,
tdlsLinkEstablishCmdInfo->supportedChannels,
tdlsLinkEstablishCmdInfo->supportedChannelsLen);