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-12 15:49:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacld-3.0: Fix implicit conversion in lim_process_sme_req_messages.c" into wlan-cld3.driver.lnx.2.0

Browse source
This commit is contained in:
CNSS_WLAN Service 2017-12-09 06:54:18 -08:00 • committed by Gerrit - the friendly Code Review server
commit 91e38af93c
4 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/mac/src/pe/lim/lim_assoc_utils.c
View file

@ -864,7 +864,7 @@ void
lim_reject_association(tpAniSirGlobal mac_ctx, tSirMacAddr peer_addr,
uint8_t sub_type, uint8_t add_pre_auth_context,
tAniAuthType auth_type, uint16_t sta_id,
uint8_t delete_sta, tSirResultCodes result_code,
uint8_t delete_sta, enum eSirMacStatusCodes result_code,
tpPESession session_entry)
{
tpDphHashNode sta_ds;
@ -2993,7 +2993,6 @@ void lim_handle_cnf_wait_timeout(tpAniSirGlobal pMac, uint16_t staId)
true,
pStaDs->mlmStaContext.authType,
pStaDs->assocId, true,
(tSirResultCodes)
eSIR_MAC_UNSPEC_FAILURE_STATUS,
psessionEntry);
}

4
core/mac/src/pe/lim/lim_assoc_utils.h
View file

@ -62,8 +62,8 @@ void limPostDummyToTmRing(tpAniSirGlobal, tpDphHashNode);
void limPostPacketToTdRing(tpAniSirGlobal, tpDphHashNode, uint8_t);
tSirRetStatus lim_cleanup_rx_path(tpAniSirGlobal, tpDphHashNode, tpPESession);
void lim_reject_association(tpAniSirGlobal, tSirMacAddr, uint8_t,
uint8_t, tAniAuthType,
uint16_t, uint8_t, tSirResultCodes, tpPESession);
uint8_t, tAniAuthType, uint16_t, uint8_t,
enum eSirMacStatusCodes, tpPESession);
tSirRetStatus lim_populate_peer_rate_set(tpAniSirGlobal pMac,
tpSirSupportedRates pRates,

20
core/mac/src/pe/lim/lim_process_assoc_req_frame.c
View file

@ -943,7 +943,7 @@ static bool lim_process_assoc_req_no_sta_ctx(tpAniSirGlobal mac_ctx,
mac_ctx->lim.maxStation);
lim_reject_association(mac_ctx, hdr->sa, sub_type, false,
(tAniAuthType) 0, 0, false,
(tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS,
eSIR_MAC_UNSPEC_FAILURE_STATUS,
session);
return false;
}
@ -1414,7 +1414,7 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
lim_reject_association(mac_ctx, hdr->sa,
sub_type, true, auth_type, peer_idx, false,
(tSirResultCodes)eSIR_MAC_UNSPEC_FAILURE_STATUS,
eSIR_MAC_UNSPEC_FAILURE_STATUS,
session);
pe_err("Delete dph hash entry");
if (dph_delete_hash_entry(mac_ctx, hdr->sa, sta_ds->assocId,
@ -1499,7 +1499,7 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
pe_err("Couldn't get PMF SA Query retry interval value");
lim_reject_association(mac_ctx, hdr->sa, sub_type, true,
auth_type, peer_idx, false,
(tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS,
eSIR_MAC_UNSPEC_FAILURE_STATUS,
session);
return false;
}
@ -1515,7 +1515,7 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
pe_err("could not create PMF SA Query timer");
lim_reject_association(mac_ctx, hdr->sa, sub_type,
true, auth_type, peer_idx, false,
(tSirResultCodes)eSIR_MAC_UNSPEC_FAILURE_STATUS,
eSIR_MAC_UNSPEC_FAILURE_STATUS,
session);
return false;
}
@ -1576,7 +1576,7 @@ static bool lim_update_sta_ctx(tpAniSirGlobal mac_ctx, tpPESession session,
sta_ds->mlmStaContext.subType, true,
sta_ds->mlmStaContext.authType,
sta_ds->assocId, true,
(tSirResultCodes)eSIR_MAC_UNSPEC_FAILURE_STATUS,
eSIR_MAC_UNSPEC_FAILURE_STATUS,
session);
if (session->parsedAssocReq)
@ -1607,8 +1607,7 @@ static bool lim_update_sta_ctx(tpAniSirGlobal mac_ctx, tpPESession session,
sta_ds->mlmStaContext.subType, true,
sta_ds->mlmStaContext.authType,
sta_ds->assocId, true,
(tSirResultCodes)
eSIR_MAC_UNSPEC_FAILURE_STATUS,
eSIR_MAC_UNSPEC_FAILURE_STATUS,
session);
/* Restoring the state back. */
@ -1630,8 +1629,7 @@ static bool lim_update_sta_ctx(tpAniSirGlobal mac_ctx, tpPESession session,
sta_ds->mlmStaContext.subType, true,
sta_ds->mlmStaContext.authType,
sta_ds->assocId, true,
(tSirResultCodes)
eSIR_MAC_WME_REFUSED_STATUS,
eSIR_MAC_WME_REFUSED_STATUS,
session);
/* Restoring the state back. */
@ -1968,7 +1966,7 @@ void lim_process_assoc_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
pe_err("PeerIdx not avaialble. Reject associaton");
lim_reject_association(mac_ctx, hdr->sa, sub_type,
true, auth_type, peer_idx, false,
(tSirResultCodes)eSIR_MAC_UNSPEC_FAILURE_STATUS,
eSIR_MAC_UNSPEC_FAILURE_STATUS,
session);
goto error;
}
@ -1988,7 +1986,7 @@ void lim_process_assoc_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
lim_reject_association(mac_ctx, hdr->sa, sub_type,
true, auth_type, peer_idx, false,
(tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS,
eSIR_MAC_UNSPEC_FAILURE_STATUS,
session);
goto error;
}

3
core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
View file

@ -1887,7 +1887,7 @@ void lim_process_ap_mlm_del_sta_rsp(tpAniSirGlobal mac_ctx,
sta_ds->mlmStaContext.subType, true,
sta_ds->mlmStaContext.authType, sta_ds->assocId,
true,
(tSirResultCodes)eSIR_MAC_UNSPEC_FAILURE_STATUS,
eSIR_MAC_UNSPEC_FAILURE_STATUS,
session_entry);
}
return;
@ -1997,7 +1997,6 @@ void lim_process_ap_mlm_add_sta_rsp(tpAniSirGlobal pMac,
pStaDs->mlmStaContext.subType,
true, pStaDs->mlmStaContext.authType,
pStaDs->assocId, true,
(tSirResultCodes)
eSIR_MAC_UNSPEC_FAILURE_STATUS,
psessionEntry);
goto end;