From 4fb838c4e98d6a20f3e5218547cde77dcd910fda Mon Sep 17 00:00:00 2001 From: Yeshwanth Sriram Guntuka Date: Fri, 2 Aug 2019 18:28:33 +0530 Subject: [PATCH] qcacld-3.0: TDLS sta_id cleanup for hdd_roam_deregister_tdlssta hdd_roam_deregister_tdlssta takes sta_id as input and as a part of clean up of sta_id, replace it by peer mac address. Change-Id: Ie0d8e16606bd72d77cc5f152cf5bfe530bd3856b CRs-Fixed: 2503949 --- components/tdls/core/src/wlan_tdls_cmds_process.c | 4 ++-- components/tdls/core/src/wlan_tdls_ct.c | 2 +- components/tdls/core/src/wlan_tdls_main.c | 2 +- components/tdls/dispatcher/inc/wlan_tdls_public_structs.h | 7 ++++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/components/tdls/core/src/wlan_tdls_cmds_process.c b/components/tdls/core/src/wlan_tdls_cmds_process.c index 0a665b1cdf..c3e457494e 100644 --- a/components/tdls/core/src/wlan_tdls_cmds_process.c +++ b/components/tdls/core/src/wlan_tdls_cmds_process.c @@ -1506,13 +1506,13 @@ QDF_STATUS tdls_process_del_peer_rsp(struct tdls_del_sta_rsp *rsp) if (TDLS_IS_LINK_CONNECTED(curr_peer)) { soc_obj->tdls_dereg_peer( soc_obj->tdls_peer_context, - id, curr_peer->sta_id); + id, &curr_peer->peer_mac); tdls_decrement_peer_count(soc_obj); } else if (TDLS_LINK_CONNECTING == curr_peer->link_status) { soc_obj->tdls_dereg_peer( soc_obj->tdls_peer_context, - id, curr_peer->sta_id); + id, &curr_peer->peer_mac); } } tdls_reset_peer(vdev_obj, macaddr); diff --git a/components/tdls/core/src/wlan_tdls_ct.c b/components/tdls/core/src/wlan_tdls_ct.c index 32797da7cd..10a14f218f 100644 --- a/components/tdls/core/src/wlan_tdls_ct.c +++ b/components/tdls/core/src/wlan_tdls_ct.c @@ -1268,7 +1268,7 @@ void tdls_disable_offchan_and_teardown_links( tdls_soc->tdls_dereg_peer( tdls_soc->tdls_peer_context, wlan_vdev_get_id(vdev), - curr_peer->sta_id); + &curr_peer->peer_mac); tdls_decrement_peer_count(tdls_soc); tdls_soc->tdls_conn_info[staidx].sta_id = INVALID_TDLS_PEER_ID; tdls_soc->tdls_conn_info[staidx].session_id = 255; diff --git a/components/tdls/core/src/wlan_tdls_main.c b/components/tdls/core/src/wlan_tdls_main.c index 746324d6c1..52ef0d3a73 100644 --- a/components/tdls/core/src/wlan_tdls_main.c +++ b/components/tdls/core/src/wlan_tdls_main.c @@ -519,7 +519,7 @@ static QDF_STATUS tdls_process_reset_all_peers(struct wlan_objmgr_vdev *vdev) tdls_soc->tdls_dereg_peer( tdls_soc->tdls_peer_context, wlan_vdev_get_id(vdev), - curr_peer->sta_id); + &curr_peer->peer_mac); tdls_decrement_peer_count(tdls_soc); tdls_soc->tdls_conn_info[staidx].sta_id = INVALID_TDLS_PEER_ID; tdls_soc->tdls_conn_info[staidx].session_id = 255; diff --git a/components/tdls/dispatcher/inc/wlan_tdls_public_structs.h b/components/tdls/dispatcher/inc/wlan_tdls_public_structs.h index 5d8b3af7c7..68edd6e3ca 100644 --- a/components/tdls/dispatcher/inc/wlan_tdls_public_structs.h +++ b/components/tdls/dispatcher/inc/wlan_tdls_public_structs.h @@ -595,9 +595,10 @@ typedef QDF_STATUS (*tdls_register_peer_callback)(void *userdata, uint8_t qos); /* This callback is used to deregister TDLS peer from the datapath */ -typedef QDF_STATUS (*tdls_deregister_peer_callback)(void *userdata, - uint32_t vdev_id, - uint8_t sta_id); +typedef QDF_STATUS +(*tdls_deregister_peer_callback)(void *userdata, + uint32_t vdev_id, + struct qdf_mac_addr *peer_mac); /* This callback is used to update datapath vdev flags */ typedef QDF_STATUS