lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Remove obsolete use of DPU signatures

Browse Source 
In a previous version of the driver both unicast and broadcast DPU
signatures were used to synchronize the data plane with the control
plane. However the current version of the driver does not use this
synchronization mechanism, so remove propagation of the DPU signatures
from the UMAC. This is part of the plan to completely remove these
signatures from throughout the driver.

Change-Id: I6a1808d0905bb0c4550b16cf2b2157a529caa9e9
CRs-Fixed: 2200997
This commit is contained in:
Jeff Johnson 2018-03-05 11:58:47 -08:00
parent 5cc21cea5b
commit 582a3382c3
11 changed files with 7 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/mac/inc/sir_api.h
View File

@ -1176,15 +1176,6 @@ typedef struct sSirSmeJoinRsp {
#endif
uint32_t staId; /* Station ID for peer */
/* The DPU signatures will be sent eventually to TL to help it determine
* the association to which a packet belongs to
* Unicast DPU signature
*/
uint8_t ucastSig;
/*Broadcast DPU signature */
uint8_t bcastSig;
/*Timing measurement capability */
uint8_t timingMeasCap;
@ -1254,8 +1245,6 @@ typedef struct sSirSmeAssocInd {
uint16_t aid;
tSirMacAddr bssId; /* Self BSSID */
uint16_t staId; /* Station ID for peer */
uint8_t uniSig; /* DPU signature for unicast packets */
uint8_t bcastSig; /* DPU signature for broadcast packets */
tAniAuthType authType;
tAniSSID ssId; /* SSID used by STA to associate */
tSirWAPIie wapiIE; /* WAPI IE received from peer */
@ -2163,16 +2152,6 @@ typedef struct sSmeIbssPeerInd {
struct qdf_mac_addr peer_addr;
uint16_t staId;
/*
* The DPU signatures will be sent eventually to TL to help it determine
* the association to which a packet belongs to
*/
/* Unicast DPU signature */
uint8_t ucastSig;
/*Broadcast DPU signature */
uint8_t bcastSig;
/* Beacon will be appended for new Peer indication. */
} tSmeIbssPeerInd, *tpSmeIbssPeerInd;

8
core/mac/src/include/dph_global.h
View File

@ -227,14 +227,6 @@ typedef struct sDphHashNode {
uint16_t staIndex;
uint8_t staAddr[6];
uint8_t staType;
/*
* The DPU signatures will be sent eventually to TL to help
* it determine the association to which a packet belongs to
*/
/*Unicast DPU signature */
uint8_t ucUcastSig;
/*Broadcast DPU signature */
uint8_t ucBcastSig;
uint8_t vhtSupportedChannelWidthSet;
uint8_t vhtSupportedRxNss;

6
core/mac/src/pe/lim/lim_api.c
View File

@ -2340,10 +2340,6 @@ QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx,
curr_sta_ds->bssId = add_bss_params->bssIdx;
curr_sta_ds->staIndex =
add_bss_params->staContext.staIdx;
curr_sta_ds->ucUcastSig =
add_bss_params->staContext.ucUcastSig;
curr_sta_ds->ucBcastSig =
add_bss_params->staContext.ucBcastSig;
rrm_cache_mgmt_tx_power(mac_ctx,
add_bss_params->txMgmtPower, ft_session_ptr);
mac_ctx->roam.reassocRespLen = roam_sync_ind_ptr->reassocRespLength;
@ -2425,8 +2421,6 @@ QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx,
roam_sync_ind_ptr->join_rsp->vht_channel_width =
ft_session_ptr->ch_width;
roam_sync_ind_ptr->join_rsp->staId = curr_sta_ds->staIndex;
roam_sync_ind_ptr->join_rsp->ucastSig = curr_sta_ds->ucUcastSig;
roam_sync_ind_ptr->join_rsp->bcastSig = curr_sta_ds->ucBcastSig;
roam_sync_ind_ptr->join_rsp->timingMeasCap = curr_sta_ds->timingMeasCap;
roam_sync_ind_ptr->join_rsp->nss = curr_sta_ds->nss;
roam_sync_ind_ptr->join_rsp->max_rate_flags =

24
core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@ -458,11 +458,8 @@ ibss_dph_entry_add(tpAniSirGlobal pMac,
/* send a status change notification */
static void
ibss_status_chg_notify(tpAniSirGlobal pMac,
tSirMacAddr peerAddr,
uint16_t staIndex,
uint8_t ucastSig,
uint8_t bcastSig, uint16_t status, uint8_t sessionId)
ibss_status_chg_notify(tpAniSirGlobal pMac, tSirMacAddr peerAddr,
uint16_t staIndex, uint16_t status, uint8_t sessionId)
{
tLimIbssPeerNode *peerNode;
@ -479,7 +476,7 @@ ibss_status_chg_notify(tpAniSirGlobal pMac,
peerNode->beaconLen = 0;
}
lim_send_sme_ibss_peer_ind(pMac, peerAddr, staIndex, ucastSig, bcastSig,
lim_send_sme_ibss_peer_ind(pMac, peerAddr, staIndex,
beacon, bcnLen, status, sessionId);
if (beacon != NULL) {
@ -677,8 +674,6 @@ static void lim_ibss_delete_all_peers(tpAniSirGlobal pMac,
ibss_status_chg_notify(pMac, pCurrNode->peerMacAddr,
pStaDs->staIndex,
pStaDs->ucUcastSig,
pStaDs->ucBcastSig,
eWNI_SME_IBSS_PEER_DEPARTED_IND,
psessionEntry->smeSessionId);
lim_release_peer_idx(pMac, peerIdx, psessionEntry);
@ -1160,7 +1155,6 @@ void lim_process_ibss_del_sta_rsp(tpAniSirGlobal mac_ctx,
ibss_status_chg_notify(mac_ctx,
del_sta_params->staMac,
sta_ds->staIndex,
sta_ds->ucUcastSig, sta_ds->ucBcastSig,
eWNI_SME_IBSS_PEER_DEPARTED_IND,
pe_session->smeSessionId);
@ -1208,16 +1202,13 @@ lim_ibss_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEntry)
pStaDs->bssId = pAddStaParams->bssIdx;
pStaDs->staIndex = pAddStaParams->staIdx;
pStaDs->ucUcastSig = pAddStaParams->ucUcastSig;
pStaDs->ucBcastSig = pAddStaParams->ucBcastSig;
pStaDs->valid = 1;
pStaDs->mlmStaContext.mlmState = eLIM_MLM_LINK_ESTABLISHED_STATE;
pe_debug("IBSS: sending IBSS_NEW_PEER msg to SME!");
ibss_status_chg_notify(pMac, pAddStaParams->staMac,
pStaDs->staIndex, pStaDs->ucUcastSig,
pStaDs->ucBcastSig,
pStaDs->staIndex,
eWNI_SME_IBSS_NEW_PEER_IND,
psessionEntry->smeSessionId);
@ -1573,8 +1564,6 @@ void lim_ibss_heart_beat_handle(tpAniSirGlobal mac_ctx, tpPESession session)
tpDphHashNode stads = 0;
uint32_t threshold = 0;
uint16_t sta_idx = 0;
uint8_t ucast_sig = 0;
uint8_t bcast_sig = 0;
/*
* MLM BSS is started and if PE in scanmode then MLM state will be
@ -1614,8 +1603,6 @@ void lim_ibss_heart_beat_handle(tpAniSirGlobal mac_ctx, tpPESession session)
&session->dph.dphHashTable);
if (stads) {
sta_idx = stads->staIndex;
ucast_sig = stads->ucUcastSig;
bcast_sig = stads->ucBcastSig;
(void)lim_del_sta(mac_ctx, stads, false,
session);
@ -1626,7 +1613,6 @@ void lim_ibss_heart_beat_handle(tpAniSirGlobal mac_ctx, tpPESession session)
/* Send indication. */
ibss_status_chg_notify(mac_ctx,
tempnode->peerMacAddr, sta_idx,
ucast_sig, bcast_sig,
eWNI_SME_IBSS_PEER_DEPARTED_IND,
session->smeSessionId);
}

4
core/mac/src/pe/lim/lim_process_mlm_host_roam.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@ -447,8 +447,6 @@ void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac,
pStaDs->bssId = pAddBssParams->bssIdx;
/* STA Index(genr by HAL) for the BSS entry is stored here */
pStaDs->staIndex = pAddBssParams->staContext.staIdx;
pStaDs->ucUcastSig = pAddBssParams->staContext.ucUcastSig;
pStaDs->ucBcastSig = pAddBssParams->staContext.ucBcastSig;
rrm_cache_mgmt_tx_power(pMac, pAddBssParams->txMgmtPower,
psessionEntry);

4
core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
View File

@ -2514,10 +2514,6 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx,
* entry is stored here
*/
sta_ds->staIndex = add_bss_params->staContext.staIdx;
sta_ds->ucUcastSig =
add_bss_params->staContext.ucUcastSig;
sta_ds->ucBcastSig =
add_bss_params->staContext.ucBcastSig;
/* Downgrade the EDCA parameters if needed */
lim_set_active_edca_params(mac_ctx,
session_entry->gLimEdcaParams, session_entry);

4
core/mac/src/pe/lim/lim_process_tdls.c
View File

@ -2681,8 +2681,6 @@ static QDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac,
addStaRsp->statusCode = status;
if (pStaDs) {
addStaRsp->staId = pStaDs->staIndex;
addStaRsp->ucastSig = pStaDs->ucUcastSig;
addStaRsp->bcastSig = pStaDs->ucBcastSig;
}
if (peerMac) {
qdf_mem_copy(addStaRsp->peermac.bytes,
@ -2735,8 +2733,6 @@ QDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal pMac, void *msg,
pStaDs->bssId = pAddStaParams->bssIdx;
pStaDs->staIndex = pAddStaParams->staIdx;
pStaDs->ucUcastSig = pAddStaParams->ucUcastSig;
pStaDs->ucBcastSig = pAddStaParams->ucBcastSig;
pStaDs->mlmStaContext.mlmState = eLIM_MLM_LINK_ESTABLISHED_STATE;
pStaDs->valid = 1;
add_sta_error:

8
core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
View File

@ -545,10 +545,6 @@ lim_send_sme_join_reassoc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
} else {
/* Pass the peer's staId */
sme_join_rsp->staId = sta_ds->staIndex;
sme_join_rsp->ucastSig =
sta_ds->ucUcastSig;
sme_join_rsp->bcastSig =
sta_ds->ucBcastSig;
sme_join_rsp->timingMeasCap =
sta_ds->timingMeasCap;
#ifdef FEATURE_WLAN_TDLS
@ -1855,8 +1851,6 @@ void
lim_send_sme_ibss_peer_ind(tpAniSirGlobal pMac,
tSirMacAddr peerMacAddr,
uint16_t staIndex,
uint8_t ucastIdx,
uint8_t bcastIdx,
uint8_t *beacon,
uint16_t beaconLen, uint16_t msgType, uint8_t sessionId)
{
@ -1872,8 +1866,6 @@ lim_send_sme_ibss_peer_ind(tpAniSirGlobal pMac,
qdf_mem_copy((uint8_t *) pNewPeerInd->peer_addr.bytes,
peerMacAddr, QDF_MAC_ADDR_SIZE);
pNewPeerInd->staId = staIndex;
pNewPeerInd->ucastSig = ucastIdx;
pNewPeerInd->bcastSig = bcastIdx;
pNewPeerInd->mesgLen = sizeof(tSmeIbssPeerInd) + beaconLen;
pNewPeerInd->mesgType = msgType;
pNewPeerInd->sessionId = sessionId;

3
core/mac/src/pe/lim/lim_send_sme_rsp_messages.h
View File

@ -90,8 +90,7 @@ void lim_send_sme_pe_ese_tsm_rsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats
#endif
void lim_send_sme_ibss_peer_ind(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr,
uint16_t staIndex, uint8_t ucastIdx,
uint8_t bcastIdx, uint8_t *beacon,
uint16_t staIndex, uint8_t *beacon,
uint16_t beaconLen, uint16_t msgType,
uint8_t sessionId);
void lim_send_sme_max_assoc_exceeded_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr,

2
core/mac/src/pe/nan/nan_datapath.c
View File

@ -533,8 +533,6 @@ void lim_ndp_add_sta_rsp(tpAniSirGlobal mac_ctx, tpPESession session,
}
sta_ds->bssId = add_sta_rsp->bssIdx;
sta_ds->staIndex = add_sta_rsp->staIdx;
sta_ds->ucUcastSig = add_sta_rsp->ucUcastSig;
sta_ds->ucBcastSig = add_sta_rsp->ucBcastSig;
sta_ds->valid = 1;
sta_ds->mlmStaContext.mlmState = eLIM_MLM_LINK_ESTABLISHED_STATE;
lim_send_sme_ndp_add_sta_rsp(mac_ctx, session, add_sta_rsp);

4
core/wma/inc/wma_if.h
View File

@ -202,8 +202,6 @@ typedef struct sAniProbeRspStruct {
* @respReqd: A flag to indicate to HAL if the response message is required
* @rmfEnabled: Robust Management Frame (RMF) enabled/disabled
* @encryptType: The unicast encryption type in the association
* @ucUcastSig: Unicast DPU index
* @ucBcastSig: Broadcast DPU index
* @sessionId: PE session id
* @p2pCapableSta: if this is a P2P Capable Sta
* @csaOffloadEnable: CSA offload enable flag
@ -299,8 +297,6 @@ typedef struct {
uint8_t respReqd;
uint8_t rmfEnabled;
uint32_t encryptType;
uint8_t ucUcastSig;
uint8_t ucBcastSig;
uint8_t sessionId;
uint8_t p2pCapableSta;
uint8_t csaOffloadEnable;