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

qcawifi: Hold peer_ref while adding peer to multipass_list

Browse Source 
Hold peer_ref while adding peer to multipass_list
which will be released during the removal from the list.

Change-Id: I37ada3fd433dc9a8858dedb82dc9caee151fc88a
This commit is contained in:
Pavankumar Nandeshwar
2020-03-09 12:57:21 +05:30
committed by Gerrit - the friendly Code Review server
parent 922817af53
commit 9efee1898c
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dp/wifi3.0/dp_txrx_wds.c
View File

@@ -664,16 +664,27 @@ void dp_peer_multipass_list_remove(struct dp_peer *peer)
/** /**
* dp_peer_multipass_list_add: add to new multipass list * dp_peer_multipass_list_add: add to new multipass list
* @dp_soc: soc handle * @dp_soc: soc handle
* @peer: peer handle * @peer_mac: mac address
* @vdev_id: vdev id for peer
* @vlan_id: vlan_id
* *
* return: void * return: void
*/ */
static void dp_peer_multipass_list_add(struct dp_soc *soc, struct dp_peer *peer) static void dp_peer_multipass_list_add(struct dp_soc *soc, uint8_t *peer_mac,
uint8_t vdev_id, uint16_t vlan_id)
{ {
struct dp_peer *peer =
dp_peer_find_hash_find(soc, peer_mac, 0, vdev_id);
if (qdf_unlikely(!peer)) {
qdf_err("NULL peer");
return;
}
/* /*
* Ref_cnt is incremented inside dp_peer_find_hash_find(). * Ref_cnt is incremented inside dp_peer_find_hash_find().
* Decrement it when element is deleted from the list. * Decrement it when element is deleted from the list.
*/ */
peer->vlan_id = vlan_id;
qdf_spin_lock_bh(&peer->vdev->mpass_peer_mutex); qdf_spin_lock_bh(&peer->vdev->mpass_peer_mutex);
TAILQ_INSERT_HEAD(&peer->vdev->mpass_peer_list, peer, TAILQ_INSERT_HEAD(&peer->vdev->mpass_peer_list, peer,
mpass_peer_list_elem); mpass_peer_list_elem);
@@ -683,6 +694,7 @@ static void dp_peer_multipass_list_add(struct dp_soc *soc, struct dp_peer *peer)
/** /**
* dp_peer_set_vlan_id: set vlan_id for this peer * dp_peer_set_vlan_id: set vlan_id for this peer
* @cdp_soc: soc handle * @cdp_soc: soc handle
* @vdev_id: vdev id for peer
* @peer_mac: mac address * @peer_mac: mac address
* @vlan_id: vlan id for peer * @vlan_id: vlan id for peer
* *
@@ -693,7 +705,6 @@ void dp_peer_set_vlan_id(struct cdp_soc_t *cdp_soc,
uint16_t vlan_id) uint16_t vlan_id)
{ {
struct dp_soc *soc = (struct dp_soc *)cdp_soc; struct dp_soc *soc = (struct dp_soc *)cdp_soc;
struct dp_peer *peer = NULL;
struct dp_vdev *vdev = struct dp_vdev *vdev =
dp_get_vdev_from_soc_vdev_id_wifi3((struct dp_soc *)soc, dp_get_vdev_from_soc_vdev_id_wifi3((struct dp_soc *)soc,
vdev_id); vdev_id);
@@ -701,21 +712,7 @@ void dp_peer_set_vlan_id(struct cdp_soc_t *cdp_soc,
if (!vdev || !vdev->multipass_en) if (!vdev || !vdev->multipass_en)
return; return;
peer = dp_peer_find_hash_find(soc, peer_mac, 0, vdev->vdev_id); dp_peer_multipass_list_add(soc, peer_mac, vdev_id, vlan_id);
if (qdf_unlikely(!peer)) {
qdf_err("NULL peer");
return;
}
peer->vlan_id = vlan_id;
dp_peer_multipass_list_add(soc, peer);
/* Ref_cnt is incremented inside dp_peer_find_hash_find().
* Decrement it here.
*/
dp_peer_unref_delete(peer);
} }
/** /**