qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirSmeTkipCntrMeasReq

Replace tSirMacAddr with cdf_mac_addr in sSirSmeTkipCntrMeasReq.

Change-Id: I404f7b7976b8d3096e9a8963710a019e8671b1fe
CRs-Fixed: 898864
This commit is contained in:
Srinivas Girigowda 2015-09-24 15:57:40 -07:00 • committed by Satish Singh
commit c8b79e4170
4 changed files with 30 additions and 34 deletions

View file

@ -1208,7 +1208,7 @@ typedef struct sSirSmeTkipCntrMeasReq {
uint16_t length;
uint8_t sessionId; /* Session ID */
uint16_t transactionId; /* Transaction ID for cmd */
tSirMacAddr bssId; /* Peer BSSID */
struct cdf_mac_addr bssId; /* Peer BSSID */
bool bEnable; /* Start/stop countermeasures */
} cdf_packed tSirSmeTkipCntrMeasReq, *tpSirSmeTkipCntrMeasReq;

View file

@ -3354,8 +3354,7 @@ void lim_process_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
sizeof(struct sSirSmeTkipCntrMeasReq));
psessionEntry = pe_find_session_by_bssid(pMac,
tkipCntrMeasReq.bssId,
&sessionId);
tkipCntrMeasReq.bssId.bytes, &sessionId);
if (NULL == psessionEntry) {
lim_log(pMac, LOGE,
FL("session does not exist for given BSSID "));

View file

@ -3061,6 +3061,33 @@ CDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac,
return status;
}
static CDF_STATUS
csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac,
uint32_t sessionId, bool bEnable,
struct cdf_mac_addr *bssId)
{
CDF_STATUS status = CDF_STATUS_SUCCESS;
tSirSmeTkipCntrMeasReq *pMsg;
do {
pMsg = cdf_mem_malloc(sizeof(tSirSmeTkipCntrMeasReq));
if (NULL == pMsg)
status = CDF_STATUS_E_NOMEM;
else
status = CDF_STATUS_SUCCESS;
if (!CDF_IS_STATUS_SUCCESS(status))
break;
cdf_mem_set(pMsg, sizeof(tSirSmeTkipCntrMeasReq), 0);
pMsg->messageType = eWNI_SME_TKIP_CNTR_MEAS_REQ;
pMsg->length = sizeof(tSirSmeTkipCntrMeasReq);
pMsg->sessionId = sessionId;
pMsg->transactionId = 0;
cdf_copy_macaddr(&pMsg->bssId, bssId);
pMsg->bEnable = bEnable;
status = cds_send_mb_message_to_mac(pMsg);
} while (0);
return status;
}
CDF_STATUS
csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId,
bool bEnable)
@ -3086,7 +3113,7 @@ csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId,
", Enable = %d", MAC_ADDR_ARRAY(bssId.bytes), bEnable);
status =
csr_send_mb_tkip_counter_measures_req_msg(pMac, sessionId,
bEnable, bssId.bytes);
bEnable, &bssId);
return status;
}
@ -14155,32 +14182,6 @@ CDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
return cds_send_mb_message_to_mac(pMsg);
}
CDF_STATUS csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac,
uint32_t sessionId, bool bEnable,
tSirMacAddr bssId)
{
CDF_STATUS status = CDF_STATUS_SUCCESS;
tSirSmeTkipCntrMeasReq *pMsg;
do {
pMsg = cdf_mem_malloc(sizeof(tSirSmeTkipCntrMeasReq));
if (NULL == pMsg)
status = CDF_STATUS_E_NOMEM;
else
status = CDF_STATUS_SUCCESS;
if (!CDF_IS_STATUS_SUCCESS(status))
break;
cdf_mem_set(pMsg, sizeof(tSirSmeTkipCntrMeasReq), 0);
pMsg->messageType = eWNI_SME_TKIP_CNTR_MEAS_REQ;
pMsg->length = sizeof(tSirSmeTkipCntrMeasReq);
pMsg->sessionId = sessionId;
pMsg->transactionId = 0;
cdf_mem_copy(pMsg->bssId, bssId, sizeof(tSirMacAddr));
pMsg->bEnable = bEnable;
status = cds_send_mb_message_to_mac(pMsg);
} while (0);
return status;
}
CDF_STATUS
csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
CDF_MODULE_ID modId, tSirMacAddr bssId,

View file

@ -956,10 +956,6 @@ CDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac,
CDF_STATUS csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac,
uint32_t sessionId, bool bEnable);
CDF_STATUS csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac,
uint32_t sessinId, bool bEnable,
tSirMacAddr bssId);
/* ---------------------------------------------------------------------------
\fn csr_roam_get_associated_stas
\brief csr function that HDD calls to get list of associated stations based on module ID