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-11 07:03:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirWPSPBCSession

Browse source 
Replace tSirMacAddr with cdf_mac_addr in tSirWPSPBCSession.

Change-Id: I46c321c74cfae794c3a77be2cba198baa5aba12f
CRs-Fixed: 898864
This commit is contained in:
Srinivas Girigowda 2015-11-24 15:39:54 -08:00 • committed by Satish Singh
commit 419e36b4fe
4 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2478,7 +2478,7 @@ typedef struct sSirSetHT2040Mode {
typedef struct sSirWPSPBCSession {
struct sSirWPSPBCSession *next;
tSirMacAddr addr;
struct cdf_mac_addr addr;
uint8_t uuid_e[SIR_WPS_UUID_LEN];
uint32_t timestamp;
} tSirWPSPBCSession;

25
core/mac/src/pe/lim/lim_process_probe_req_frame.c
View file

@ -61,7 +61,7 @@ lim_send_sme_probe_req_ind(tpAniSirGlobal pMac,
/**
* lim_get_wpspbc_sessions() - to get wps pbs sessions
* @mac_ctx: Pointer to Global MAC structure
* @addr: A pointer to probe request source MAC addresss
* @addr: probe request source MAC addresss
* @uuid_e: A pointer to UUIDE element of WPS IE in WPS PBC probe request
* @session: A pointer to station PE session
*
@ -71,7 +71,7 @@ lim_send_sme_probe_req_ind(tpAniSirGlobal pMac,
* @return None
*/
void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, uint8_t *addr,
void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct cdf_mac_addr addr,
uint8_t *uuid_e, eWPSPBCOverlap *overlap,
tpPESession session)
{
@ -81,7 +81,7 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, uint8_t *addr,
cur_time = (uint32_t) (cdf_mc_timer_get_system_ticks() /
CDF_TICKS_PER_SECOND);
cdf_mem_set((uint8_t *) addr, sizeof(tSirMacAddr), 0);
cdf_zero_macaddr(&addr);
cdf_mem_set((uint8_t *) uuid_e, SIR_WPS_UUID_LEN, 0);
for (pbc = session->pAPWPSPBCSession; pbc; pbc = pbc->next) {
if (cur_time > pbc->timestamp + SIR_WPS_PBC_WALK_TIME)
@ -89,8 +89,7 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, uint8_t *addr,
count++;
if (count > 1)
break;
cdf_mem_copy((uint8_t *) addr, (uint8_t *) pbc->addr,
sizeof(tSirMacAddr));
cdf_copy_macaddr(&addr, &pbc->addr);
cdf_mem_copy((uint8_t *) uuid_e, (uint8_t *) pbc->uuid_e,
SIR_WPS_UUID_LEN);
}
@ -105,8 +104,8 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, uint8_t *addr,
*overlap = eSAP_WPSPBC_ONE_WPSPBC_PROBE_REQ_IN120S;
lim_log(mac_ctx, LOGE, FL("overlap = %d"), *overlap);
sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGE, addr,
sizeof(tSirMacAddr));
sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGE, addr.bytes,
CDF_MAC_ADDR_SIZE);
sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGE, uuid_e,
SIR_WPS_UUID_LEN);
return;
@ -160,9 +159,7 @@ void lim_remove_pbc_sessions(tpAniSirGlobal mac, struct cdf_mac_addr remove_mac,
prev = pbc = session_entry->pAPWPSPBCSession;
while (pbc) {
if (cdf_mem_compare((uint8_t *) pbc->addr,
(uint8_t *) remove_mac.bytes,
CDF_MAC_ADDR_SIZE)) {
if (cdf_is_macaddr_equal(&pbc->addr, &remove_mac)) {
prev->next = pbc->next;
if (pbc == session_entry->pAPWPSPBCSession)
session_entry->pAPWPSPBCSession = pbc->next;
@ -224,8 +221,8 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac,
while (pbc) {
if (cdf_mem_compare
((uint8_t *) pbc->addr, (uint8_t *) addr,
sizeof(tSirMacAddr))
((uint8_t *) pbc->addr.bytes, (uint8_t *) addr,
CDF_MAC_ADDR_SIZE)
&& cdf_mem_compare((uint8_t *) pbc->uuid_e,
(uint8_t *) uuid_e, SIR_WPS_UUID_LEN)) {
if (prev)
@ -246,8 +243,8 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac,
)
return;
}
cdf_mem_copy((uint8_t *) pbc->addr, (uint8_t *) addr,
sizeof(tSirMacAddr));
cdf_mem_copy((uint8_t *) pbc->addr.bytes, (uint8_t *) addr,
CDF_MAC_ADDR_SIZE);
if (uuid_e)
cdf_mem_copy((uint8_t *) pbc->uuid_e,

2
core/mac/src/pe/lim/lim_process_sme_req_messages.c
View file

@ -3290,7 +3290,7 @@ void lim_process_sme_get_wpspbc_sessions(tpAniSirGlobal mac_ctx,
if (cdf_is_macaddr_zero(&get_wps_pbc_sessions_req.remove_mac)) {
lim_get_wpspbc_sessions(mac_ctx,
sap_get_wpspbc_event->addr.bytes,
sap_get_wpspbc_event->addr,
sap_get_wpspbc_event->UUID_E,
&sap_get_wpspbc_event->wpsPBCOverlap,
session_entry);

5
core/mac/src/pe/lim/lim_types.h
View file

@ -812,8 +812,9 @@ void
lim_send_vdev_restart(tpAniSirGlobal pMac, tpPESession psessionEntry,
uint8_t sessionId);
void lim_get_wpspbc_sessions(tpAniSirGlobal pMac, uint8_t *addr, uint8_t *uuid_e,
eWPSPBCOverlap *overlap, tpPESession psessionEntry);
void lim_get_wpspbc_sessions(tpAniSirGlobal pMac, struct cdf_mac_addr addr,
uint8_t *uuid_e, eWPSPBCOverlap *overlap,
tpPESession psessionEntry);
void limWPSPBCTimeout(tpAniSirGlobal pMac, tpPESession psessionEntry);
void lim_wpspbc_close(tpAniSirGlobal pMac, tpPESession psessionEntry);
void lim_remove_pbc_sessions(tpAniSirGlobal pMac,