qcacld-3.0: Add logic to delete bss peer from connection manager

Add logic to delete bss peer from connection manager.

Change-Id: Ic0f53e87525af670f7a87d84d168276bbcd73efd
CRs-Fixed: 2832733

components/mlme/core/inc/wlan_mlme_main.h

@@ -297,6 +297,15 @@ struct mlme_legacy_priv {
 #endif
 };
 
+/**
+ * struct del_bss_resp - params required for del bss response
+ * @status: QDF status
+ * @vdev_id: vdev_id
+ */
+struct del_bss_resp {
+	QDF_STATUS status;
+	uint8_t vdev_id;
+};
 
 /**
  * mlme_init_rate_config() - initialize rate configuration of vdev

components/mlme/core/inc/wlan_mlme_vdev_mgr_interface.h

@@ -310,19 +310,6 @@ bool mlme_is_vdev_in_beaconning_mode(enum QDF_OPMODE vdev_opmode);
 QDF_STATUS mlme_set_assoc_type(struct wlan_objmgr_vdev *vdev,
 			       enum vdev_assoc_type assoc_type);
 
-/**
- * mlme_get_vdev_bss_peer_mac_addr() - to get peer mac address
- * @vdev: pointer to vdev
- * @bss_peer_mac_address: pointer to bss_peer_mac_address
- *
- * This API is used to get mac address of peer.
- *
- * Return: QDF_STATUS based on overall success
- */
-QDF_STATUS mlme_get_vdev_bss_peer_mac_addr(
-		struct wlan_objmgr_vdev *vdev,
-		struct qdf_mac_addr *bss_peer_mac_address);
-
 /**
  * mlme_get_vdev_stop_type() - to get vdev stop type
  * @vdev: vdev pointer

components/mlme/core/src/wlan_mlme_vdev_mgr_interface.c

@@ -837,32 +837,6 @@ QDF_STATUS mlme_set_assoc_type(struct wlan_objmgr_vdev *vdev,
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS mlme_get_vdev_bss_peer_mac_addr(
-				struct wlan_objmgr_vdev *vdev,
-				struct qdf_mac_addr *bss_peer_mac_address)
-{
-	struct wlan_objmgr_peer *peer;
-
-	if (!vdev) {
-		mlme_legacy_err("vdev is null");
-		return QDF_STATUS_E_INVAL;
-	}
-
-	peer = wlan_objmgr_vdev_try_get_bsspeer(vdev, WLAN_MLME_OBJMGR_ID);
-	if (!peer) {
-		mlme_legacy_err("peer is null");
-		return QDF_STATUS_E_INVAL;
-	}
-	wlan_peer_obj_lock(peer);
-	qdf_mem_copy(bss_peer_mac_address->bytes, wlan_peer_get_macaddr(peer),
-		     QDF_MAC_ADDR_SIZE);
-	wlan_peer_obj_unlock(peer);
-
-	wlan_objmgr_peer_release_ref(peer, WLAN_MLME_OBJMGR_ID);
-
-	return QDF_STATUS_SUCCESS;
-}
-
 QDF_STATUS mlme_get_vdev_stop_type(struct wlan_objmgr_vdev *vdev,
 				   uint32_t *vdev_stop_type)
 {

components/umac/mlme/connection_mgr/core/src/wlan_cm_vdev_disconnect.c

@@ -20,6 +20,7 @@
  */
 
 #include "wlan_cm_vdev_api.h"
+#include "wlan_mlme_main.h"
 
 QDF_STATUS
 cm_handle_disconnect_req(struct wlan_objmgr_vdev *vdev,
@@ -52,12 +53,6 @@ cm_handle_disconnect_req(struct wlan_objmgr_vdev *vdev,
 	return status;
 }
 
-QDF_STATUS
-cm_send_bss_peer_delete_req(struct wlan_objmgr_vdev *vdev)
-{
-	return QDF_STATUS_SUCCESS;
-}
-
 QDF_STATUS
 cm_disconnect_complete_ind(struct wlan_objmgr_vdev *vdev,
 			   struct wlan_cm_discon_rsp *rsp)
@@ -67,5 +62,15 @@ cm_disconnect_complete_ind(struct wlan_objmgr_vdev *vdev,
 
 QDF_STATUS cm_send_vdev_down_req(struct wlan_objmgr_vdev *vdev)
 {
-	return QDF_STATUS_SUCCESS;
+	struct del_bss_resp *resp;
+
+	resp = qdf_mem_malloc(sizeof(*resp));
+	if (!resp)
+		return QDF_STATUS_E_NOMEM;
+
+	resp->status = QDF_STATUS_SUCCESS;
+	resp->vdev_id = wlan_vdev_get_id(vdev);
+	return wlan_vdev_mlme_sm_deliver_evt(vdev,
+					     WLAN_VDEV_SM_EV_MLME_DOWN_REQ,
+					     sizeof(*resp), resp);
 }

core/wma/inc/wma_if.h

@@ -379,16 +379,6 @@ struct add_bss_rsp {
 	uint8_t smps_mode;
 };
 
-/**
- * struct del_bss_resp - params required for del bss response
- * @status: QDF status
- * @vdev_id: vdev_id
- */
-struct del_bss_resp {
-	QDF_STATUS status;
-	uint8_t vdev_id;
-};
-
 typedef enum eDelStaReasonCode {
 	HAL_DEL_STA_REASON_CODE_KEEP_ALIVE = 0x1,
 	HAL_DEL_STA_REASON_CODE_TIM_BASED = 0x2,

core/wma/src/wma_dev_if.c

@@ -88,7 +88,8 @@
 #include "wlan_coex_ucfg_api.h"
 #include <wlan_cp_stats_mc_ucfg_api.h>
 #include "wmi_unified_vdev_api.h"
-
+#include <wlan_cm_api.h>
+#include <../../core/src/wlan_cm_vdev_api.h>
 #ifdef DCS_INTERFERENCE_DETECTION
 #include <wlan_dcs_ucfg_api.h>
 #endif
@@ -1277,7 +1278,7 @@ QDF_STATUS wma_vdev_start_resp_handler(struct vdev_mlme_obj *vdev_mlme,
 		struct qdf_mac_addr bss_peer;
 
 		status =
-			mlme_get_vdev_bss_peer_mac_addr(iface->vdev, &bss_peer);
+			wlan_vdev_get_bss_peer_mac(iface->vdev, &bss_peer);
 		if (QDF_IS_STATUS_ERROR(status)) {
 			wma_err("Failed to get bssid");
 			return QDF_STATUS_E_INVAL;
@@ -1997,7 +1998,7 @@ static int wma_remove_bss_peer(tp_wma_handle wma, uint32_t vdev_id,
 			return -EINVAL;
 		}
 	} else {
-		qdf_status = mlme_get_vdev_bss_peer_mac_addr(
+		qdf_status = wlan_vdev_get_bss_peer_mac(
 				wma->interfaces[vdev_id].vdev,
 				&bssid);
 		if (QDF_IS_STATUS_ERROR(qdf_status)) {
@@ -2212,6 +2213,7 @@ void wma_send_vdev_down(tp_wma_handle wma, struct del_bss_resp *resp)
 				      sizeof(*resp), resp);
 }
 
+#ifdef FEATURE_CM_ENABLE
 /**
  * wma_send_vdev_down_req() - handle vdev down req
  * @wma: wma handle
@@ -2219,49 +2221,48 @@ void wma_send_vdev_down(tp_wma_handle wma, struct del_bss_resp *resp)
  *
  * Return: none
  */
+
 static void wma_send_vdev_down_req(tp_wma_handle wma,
 				   struct del_bss_resp *resp)
 {
 	struct wma_txrx_node *iface = &wma->interfaces[resp->vdev_id];
+	enum QDF_OPMODE mode;
+
+	mode = wlan_vdev_mlme_get_opmode(iface->vdev);
+	if (mode == QDF_STA_MODE || mode == QDF_P2P_CLIENT_MODE) {
+		/* initiate MLME Down req from CM for STA/CLI */
+		wlan_cm_bss_peer_delete_rsp(iface->vdev, resp->status);
+		qdf_mem_free(resp);
+		return;
+	}
 
 	wlan_vdev_mlme_sm_deliver_evt(iface->vdev,
 				      WLAN_VDEV_SM_EV_MLME_DOWN_REQ,
 				      sizeof(*resp), resp);
 }
+#else
+static void wma_send_vdev_down_req(tp_wma_handle wma,
+				   struct del_bss_resp *resp)
+{
+	struct wma_txrx_node *iface = &wma->interfaces[resp->vdev_id];
 
-QDF_STATUS
-__wma_handle_vdev_stop_rsp(struct vdev_stop_response *resp_event)
+	wlan_vdev_mlme_sm_deliver_evt(iface->vdev,
+				      WLAN_VDEV_SM_EV_MLME_DOWN_REQ,
+				      sizeof(*resp), resp);
+}
+#endif
+
+static QDF_STATUS
+wma_delete_peer_on_vdev_stop(tp_wma_handle wma, uint8_t vdev_id)
 {
-	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
-	struct wma_txrx_node *iface;
-	int status = QDF_STATUS_SUCCESS;
-	struct qdf_mac_addr bssid;
 	uint32_t vdev_stop_type;
 	struct del_bss_resp *vdev_stop_resp;
+	struct wma_txrx_node *iface;
+	QDF_STATUS status;
+	struct qdf_mac_addr bssid;
 
-	if (!wma)
-		return QDF_STATUS_E_INVAL;
-
-	/* Ignore stop_response in Monitor mode */
-	if (cds_get_conparam() == QDF_GLOBAL_MONITOR_MODE)
-		return  QDF_STATUS_SUCCESS;
-
-	iface = &wma->interfaces[resp_event->vdev_id];
-
-	/* vdev in stopped state, no more waiting for key */
-	iface->is_waiting_for_key = false;
-
-	/*
-	 * Reset the rmfEnabled as there might be MGMT action frames
-	 * sent on this vdev before the next session is established.
-	 */
-	if (iface->rmfEnabled) {
-		iface->rmfEnabled = 0;
-		wma_debug("Reset rmfEnabled for vdev %d",
-			 resp_event->vdev_id);
-	}
-
-	status = mlme_get_vdev_bss_peer_mac_addr(iface->vdev, &bssid);
+	iface = &wma->interfaces[vdev_id];
+	status = wlan_vdev_get_bss_peer_mac(iface->vdev, &bssid);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		wma_err("Failed to get bssid");
 		return QDF_STATUS_E_INVAL;
@@ -2270,7 +2271,7 @@ __wma_handle_vdev_stop_rsp(struct vdev_stop_response *resp_event)
 	status = mlme_get_vdev_stop_type(iface->vdev, &vdev_stop_type);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		wma_err("Failed to get wma req msg type for vdev id %d",
-			resp_event->vdev_id);
+			vdev_id);
 		return QDF_STATUS_E_INVAL;
 	}
 
@@ -2280,12 +2281,12 @@ __wma_handle_vdev_stop_rsp(struct vdev_stop_response *resp_event)
 
 	if (vdev_stop_type == WMA_DELETE_BSS_HO_FAIL_REQ) {
 		status = wma_remove_peer(wma, bssid.bytes,
-					 resp_event->vdev_id, true);
+					 vdev_id, true);
 		if (QDF_IS_STATUS_ERROR(status))
 			goto free_params;
 
 		vdev_stop_resp->status = status;
-		vdev_stop_resp->vdev_id = resp_event->vdev_id;
+		vdev_stop_resp->vdev_id = vdev_id;
 		wma_send_vdev_down_req(wma, vdev_stop_resp);
 	} else if (vdev_stop_type == WMA_DELETE_BSS_REQ ||
 	    vdev_stop_type == WMA_SET_LINK_STATE) {
@@ -2293,18 +2294,18 @@ __wma_handle_vdev_stop_rsp(struct vdev_stop_response *resp_event)
 
 		/* CCA is required only for sta interface */
 		if (iface->type == WMI_VDEV_TYPE_STA)
-			wma_get_cca_stats(wma, resp_event->vdev_id);
+			wma_get_cca_stats(wma, vdev_id);
 		if (vdev_stop_type == WMA_DELETE_BSS_REQ)
 			type = WMA_DELETE_PEER_RSP;
 		else
 			type = WMA_SET_LINK_PEER_RSP;
 
-		vdev_stop_resp->vdev_id = resp_event->vdev_id;
+		vdev_stop_resp->vdev_id = vdev_id;
 		vdev_stop_resp->status = status;
-		status = wma_remove_bss_peer(wma, resp_event->vdev_id,
+		status = wma_remove_bss_peer(wma, vdev_id,
 					     vdev_stop_resp, type);
 		if (status) {
-			wma_err("Del bss failed vdev:%d", resp_event->vdev_id);
+			wma_err("Del bss failed vdev:%d", vdev_id);
 			wma_send_vdev_down_req(wma, vdev_stop_resp);
 			return status;
 		}
@@ -2323,6 +2324,95 @@ free_params:
 	return status;
 }
 
+#ifdef FEATURE_CM_ENABLE
+QDF_STATUS
+cm_send_bss_peer_delete_req(struct wlan_objmgr_vdev *vdev)
+{
+	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
+
+	if (!wma)
+		return QDF_STATUS_E_INVAL;
+
+	return wma_delete_peer_on_vdev_stop(wma, wlan_vdev_get_id(vdev));
+}
+
+QDF_STATUS
+__wma_handle_vdev_stop_rsp(struct vdev_stop_response *resp_event)
+{
+	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
+	struct wma_txrx_node *iface;
+	QDF_STATUS status;
+	struct qdf_mac_addr bssid;
+	enum QDF_OPMODE mode;
+
+	if (!wma)
+		return QDF_STATUS_E_INVAL;
+
+	/* Ignore stop_response in Monitor mode */
+	if (cds_get_conparam() == QDF_GLOBAL_MONITOR_MODE)
+		return  QDF_STATUS_SUCCESS;
+
+	iface = &wma->interfaces[resp_event->vdev_id];
+
+	/* vdev in stopped state, no more waiting for key */
+	iface->is_waiting_for_key = false;
+
+	/*
+	 * Reset the rmfEnabled as there might be MGMT action frames
+	 * sent on this vdev before the next session is established.
+	 */
+	if (iface->rmfEnabled) {
+		iface->rmfEnabled = 0;
+		wma_debug("Reset rmfEnabled for vdev %d",
+			 resp_event->vdev_id);
+	}
+
+	mode = wlan_vdev_mlme_get_opmode(iface->vdev);
+	if (mode == QDF_STA_MODE || mode == QDF_P2P_CLIENT_MODE) {
+		status = wlan_vdev_get_bss_peer_mac(iface->vdev, &bssid);
+		if (QDF_IS_STATUS_ERROR(status)) {
+			wma_err("Failed to get bssid");
+			return QDF_STATUS_E_INVAL;
+		}
+		/* initiate CM to delete bss peer */
+		return wlan_cm_bss_peer_delete_ind(iface->vdev,  &bssid);
+	}
+
+	return wma_delete_peer_on_vdev_stop(wma, resp_event->vdev_id);
+}
+#else
+QDF_STATUS
+__wma_handle_vdev_stop_rsp(struct vdev_stop_response *resp_event)
+{
+	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
+	struct wma_txrx_node *iface;
+
+	if (!wma)
+		return QDF_STATUS_E_INVAL;
+
+	/* Ignore stop_response in Monitor mode */
+	if (cds_get_conparam() == QDF_GLOBAL_MONITOR_MODE)
+		return  QDF_STATUS_SUCCESS;
+
+	iface = &wma->interfaces[resp_event->vdev_id];
+
+	/* vdev in stopped state, no more waiting for key */
+	iface->is_waiting_for_key = false;
+
+	/*
+	 * Reset the rmfEnabled as there might be MGMT action frames
+	 * sent on this vdev before the next session is established.
+	 */
+	if (iface->rmfEnabled) {
+		iface->rmfEnabled = 0;
+		wma_debug("Reset rmfEnabled for vdev %d",
+			 resp_event->vdev_id);
+	}
+
+	return wma_delete_peer_on_vdev_stop(wma, resp_event->vdev_id);
+}
+
+#endif
 /**
  * wma_handle_vdev_stop_rsp() - handle vdev stop resp
  * @wma: wma handle
@@ -4900,7 +4990,7 @@ void wma_delete_bss(tp_wma_handle wma, uint8_t vdev_id)
 		goto out;
 	}
 
-	status = mlme_get_vdev_bss_peer_mac_addr(iface->vdev, &bssid);
+	status = wlan_vdev_get_bss_peer_mac(iface->vdev, &bssid);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		wma_err("vdev id %d : failed to get bssid", vdev_id);
 		goto out;

core/wma/src/wma_utils.c

@@ -4169,7 +4169,7 @@ void wma_remove_bss_peer_on_vdev_start_failure(tp_wma_handle wma,
 
 	iface = &wma->interfaces[vdev_id];
 
-	status = mlme_get_vdev_bss_peer_mac_addr(iface->vdev, &bss_peer);
+	status = wlan_vdev_get_bss_peer_mac(iface->vdev, &bss_peer);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		wma_err("Failed to get bssid");
 		return;