samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Fix duplicate AST creation

Browse Source 
Only when pdev_id matches, duplicate ast_entry creation is rejected

Change-Id: If29835a4babd4be26a0fdafbef047a79255b2e25
This commit is contained in:
Prathyusha Guduri
2019-10-01 19:29:20 +05:30
committed by nshrivas
parent 56246e9faa
commit bd4fd7a5d2
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
dp/wifi3.0/dp_peer.c
View File

@@ -573,7 +573,7 @@ int dp_peer_add_ast(struct dp_soc *soc,
uint32_t flags) uint32_t flags)
{ {
struct dp_ast_entry *ast_entry = NULL; struct dp_ast_entry *ast_entry = NULL;
struct dp_vdev *vdev = NULL; struct dp_vdev *vdev = NULL, *tmp_vdev = NULL;
struct dp_pdev *pdev = NULL; struct dp_pdev *pdev = NULL;
uint8_t next_node_mac[6]; uint8_t next_node_mac[6];
int ret = -1; int ret = -1;
@@ -582,11 +582,31 @@ int dp_peer_add_ast(struct dp_soc *soc,
struct dp_peer *tmp_peer = NULL; struct dp_peer *tmp_peer = NULL;
bool is_peer_found = false; bool is_peer_found = false;
vdev = peer->vdev;
if (!vdev) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
FL("Peers vdev is NULL"));
QDF_ASSERT(0);
return ret;
}
pdev = vdev->pdev;
tmp_peer = dp_peer_find_hash_find(soc, mac_addr, 0, tmp_peer = dp_peer_find_hash_find(soc, mac_addr, 0,
DP_VDEV_ALL); DP_VDEV_ALL);
if (tmp_peer) { if (tmp_peer) {
tmp_vdev = tmp_peer->vdev;
if (!tmp_vdev) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
FL("Peers vdev is NULL"));
QDF_ASSERT(0);
dp_peer_unref_delete(tmp_peer);
return ret;
}
if (tmp_vdev->pdev->pdev_id == pdev->pdev_id)
is_peer_found = true;
dp_peer_unref_delete(tmp_peer); dp_peer_unref_delete(tmp_peer);
is_peer_found = true;
} }
qdf_spin_lock_bh(&soc->ast_lock); qdf_spin_lock_bh(&soc->ast_lock);
@@ -595,17 +615,6 @@ int dp_peer_add_ast(struct dp_soc *soc,
return ret; return ret;
} }
vdev = peer->vdev;
if (!vdev) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
FL("Peers vdev is NULL"));
QDF_ASSERT(0);
qdf_spin_unlock_bh(&soc->ast_lock);
return ret;
}
pdev = vdev->pdev;
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
"%s: pdevid: %u vdev: %u ast_entry->type: %d flags: 0x%x peer_mac: %pM peer: %pK mac %pM", "%s: pdevid: %u vdev: %u ast_entry->type: %d flags: 0x%x peer_mac: %pM peer: %pK mac %pM",
__func__, pdev->pdev_id, vdev->vdev_id, type, flags, __func__, pdev->pdev_id, vdev->vdev_id, type, flags,