From d576fc5dac682d0f33dab775e838a03d2e1983fe Mon Sep 17 00:00:00 2001 From: Bala Venkatesh Date: Wed, 22 May 2019 13:18:57 +0530 Subject: [PATCH] qcacld-3.0: Do not update the pkt cnt for connected AP For implicit and external control the tdls connection is established based on the tx and rx pkt count. But currently, pkt count with connected AP also tracked. Do not track packets for connected AP as TDLS is not possible with connected AP. Change-Id: I29d6f4e7858de1ec453d64b6fce548f5132c57d4 CRs-Fixed: 2457524 --- components/tdls/core/src/wlan_tdls_ct.c | 32 ++++++++++++++++++++----- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/components/tdls/core/src/wlan_tdls_ct.c b/components/tdls/core/src/wlan_tdls_ct.c index c076d2086766..102629e47b77 100644 --- a/components/tdls/core/src/wlan_tdls_ct.c +++ b/components/tdls/core/src/wlan_tdls_ct.c @@ -235,9 +235,10 @@ void tdls_update_rx_pkt_cnt(struct wlan_objmgr_vdev *vdev, uint8_t mac_cnt; uint8_t valid_mac_entries; struct tdls_conn_tracker_mac_table *mac_table; + struct wlan_objmgr_peer *bss_peer; if (QDF_STATUS_SUCCESS != tdls_get_vdev_objects(vdev, &tdls_vdev_obj, - &tdls_soc_obj)) + &tdls_soc_obj)) return; if (!tdls_soc_obj->enable_tdls_connection_tracker) @@ -249,10 +250,19 @@ void tdls_update_rx_pkt_cnt(struct wlan_objmgr_vdev *vdev, if (qdf_is_macaddr_group(dest_mac_addr)) return; - if (qdf_mem_cmp(vdev->vdev_mlme.macaddr, mac_addr, - QDF_MAC_ADDR_SIZE) == 0) + if (!qdf_mem_cmp(vdev->vdev_mlme.macaddr, mac_addr, + QDF_MAC_ADDR_SIZE)) return; + bss_peer = wlan_objmgr_vdev_try_get_bsspeer(vdev, WLAN_TDLS_NB_ID); + if (bss_peer) { + if (!qdf_mem_cmp(bss_peer->macaddr, mac_addr, + QDF_MAC_ADDR_SIZE)) { + wlan_objmgr_peer_release_ref(bss_peer, WLAN_TDLS_NB_ID); + return; + } + wlan_objmgr_peer_release_ref(bss_peer, WLAN_TDLS_NB_ID); + } qdf_spin_lock_bh(&tdls_soc_obj->tdls_ct_spinlock); valid_mac_entries = tdls_vdev_obj->valid_mac_entries; mac_table = tdls_vdev_obj->ct_peer_table; @@ -288,9 +298,10 @@ void tdls_update_tx_pkt_cnt(struct wlan_objmgr_vdev *vdev, uint8_t mac_cnt; uint8_t valid_mac_entries; struct tdls_conn_tracker_mac_table *mac_table; + struct wlan_objmgr_peer *bss_peer; if (QDF_STATUS_SUCCESS != tdls_get_vdev_objects(vdev, &tdls_vdev_obj, - &tdls_soc_obj)) + &tdls_soc_obj)) return; if (!tdls_soc_obj->enable_tdls_connection_tracker) @@ -299,9 +310,18 @@ void tdls_update_tx_pkt_cnt(struct wlan_objmgr_vdev *vdev, if (qdf_is_macaddr_group(mac_addr)) return; - if (qdf_mem_cmp(vdev->vdev_mlme.macaddr, mac_addr, - QDF_MAC_ADDR_SIZE) == 0) + if (!qdf_mem_cmp(vdev->vdev_mlme.macaddr, mac_addr, + QDF_MAC_ADDR_SIZE)) return; + bss_peer = wlan_objmgr_vdev_try_get_bsspeer(vdev, WLAN_TDLS_NB_ID); + if (bss_peer) { + if (!qdf_mem_cmp(bss_peer->macaddr, mac_addr, + QDF_MAC_ADDR_SIZE)) { + wlan_objmgr_peer_release_ref(bss_peer, WLAN_TDLS_NB_ID); + return; + } + wlan_objmgr_peer_release_ref(bss_peer, WLAN_TDLS_NB_ID); + } qdf_spin_lock_bh(&tdls_soc_obj->tdls_ct_spinlock); mac_table = tdls_vdev_obj->ct_peer_table;