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

Merge "qcacld-3.0: Create PMF timer when PEER associates in PMF mode" into wlan-cld3.driver.lnx.2.0

Browse source
This commit is contained in:
CNSS_WLAN Service 2017-11-20 23:35:25 -08:00 • committed by Gerrit - the friendly Code Review server
commit 33e02753ab
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3089,7 +3089,11 @@ lim_delete_dph_hash_entry(tpAniSirGlobal mac_ctx, tSirMacAddr sta_addr,
session_entry);
}
#ifdef WLAN_FEATURE_11W
tx_timer_delete(&sta_ds->pmfSaQueryTimer);
if (sta_ds->rmfEnabled) {
pe_debug("delete pmf timer sta-idx:%d assoc-id:%d",
sta_ds->staIndex, sta_ds->assocId);
tx_timer_delete(&sta_ds->pmfSaQueryTimer);
}
#endif
}

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

@ -1506,7 +1506,8 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
if (WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL_STAMIN > retry_interval) {
retry_interval = WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL_STADEF;
}
if (tx_timer_create(mac_ctx, &sta_ds->pmfSaQueryTimer,
if (sta_ds->rmfEnabled &&
tx_timer_create(mac_ctx, &sta_ds->pmfSaQueryTimer,
"PMF SA Query timer", lim_pmf_sa_query_timer_handler,
timer_id.value,
SYS_MS_TO_TICKS((retry_interval * 1024) / 1000),
@ -1518,6 +1519,9 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
session);
return false;
}
if (sta_ds->rmfEnabled)
pe_debug("Created pmf timer sta-idx:%d assoc-id:%d",
sta_ds->staIndex, sta_ds->assocId);
#endif
if (assoc_req->ExtCap.present) {

9
core/mac/src/pe/lim/lim_utils.c
View file

@ -6577,9 +6577,14 @@ void lim_del_pmf_sa_query_timer(tpAniSirGlobal mac_ctx, tpPESession pe_session)
&pe_session->dph.dphHashTable);
if (NULL == sta_ds)
continue;
if (!sta_ds->rmfEnabled) {
pe_debug("no PMF timer for sta-idx:%d assoc-id:%d",
sta_ds->staIndex, sta_ds->assocId);
continue;
}
pe_err("Deleting pmfSaQueryTimer for staid: %d",
sta_ds->staIndex);
pe_debug("Deleting pmfSaQueryTimer for sta-idx:%d assoc-id:%d",
sta_ds->staIndex, sta_ds->assocId);
tx_timer_deactivate(&sta_ds->pmfSaQueryTimer);
tx_timer_delete(&sta_ds->pmfSaQueryTimer);
}