qcacld-3.0: Add support for MLO self peer in tx mgmt path

During ANQP query, supplicant sends the action frames to firmware
and currently, host driver drops tx mgmt frames as peer is not
available. This is because in tx mgmt path, it retrieves the self
peer from non-MLO mac addr but driver creates the peer of type
AP(PEER_AP) with MLD mac addr when MLD mac addr is non-zero and for
non-MLO case, it creates self peer with non-MLD mac addr.
So, to fix this, in case of MLO mac addr, create the self peer while
creating vdev and retrieves that peer with MLD address in tx mgmt path.

Change-Id: Id7ef97668fbd1bf1914d37d09682119eb79be465
CRs-Fixed: 3297288

components/p2p/core/src/wlan_p2p_off_chan_tx.c

@@ -1188,7 +1188,6 @@ static QDF_STATUS p2p_mgmt_tx(struct tx_action_context *tx_ctx,
 	void *mac_addr;
 	uint8_t pdev_id;
 	struct wlan_objmgr_vdev *vdev;
-	struct wlan_objmgr_pdev *pdev;
 	enum QDF_OPMODE opmode;
 
 	psoc = tx_ctx->p2p_soc_obj->soc;
@@ -1196,24 +1195,10 @@ static QDF_STATUS p2p_mgmt_tx(struct tx_action_context *tx_ctx,
 	mgmt_param.frm_len = buf_len;
 	mgmt_param.vdev_id = tx_ctx->vdev_id;
 	mgmt_param.pdata = frame;
-
-	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, tx_ctx->vdev_id,
-						    WLAN_P2P_ID);
-	if (!vdev)
-		return QDF_STATUS_E_INVAL;
-
-	pdev = wlan_vdev_get_pdev(vdev);
-	if (!pdev) {
-		wlan_objmgr_vdev_release_ref(vdev, WLAN_P2P_ID);
-		return QDF_STATUS_E_INVAL;
-	}
-
 	mgmt_param.chanfreq = tx_ctx->chan_freq;
-
 	mgmt_param.qdf_ctx = wlan_psoc_get_qdf_dev(psoc);
 	if (!(mgmt_param.qdf_ctx)) {
 		p2p_err("qdf ctx is null");
-		wlan_objmgr_vdev_release_ref(vdev, WLAN_P2P_ID);
 		return QDF_STATUS_E_INVAL;
 	}
 	p2p_mgmt_set_hw_retry_count(psoc, tx_ctx, &mgmt_param);
@@ -1229,6 +1214,9 @@ static QDF_STATUS p2p_mgmt_tx(struct tx_action_context *tx_ctx,
 					    WLAN_P2P_ID);
 	}
 	if (!peer) {
+		vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc,
+							    tx_ctx->vdev_id,
+							    WLAN_P2P_ID);
 		if (vdev) {
 			opmode = wlan_vdev_mlme_get_opmode(vdev);
 			/*
@@ -1238,15 +1226,20 @@ static QDF_STATUS p2p_mgmt_tx(struct tx_action_context *tx_ctx,
 			 */
 			if (opmode == QDF_NAN_DISC_MODE ||
 			    tx_ctx->rand_mac_tx) {
-				mac_addr = wlan_vdev_mlme_get_macaddr(vdev);
+				mac_addr = wlan_vdev_mlme_get_mldaddr(vdev);
+				/* for non-MLO case, mld address will zero */
+				if (qdf_is_macaddr_zero(
+					(struct qdf_mac_addr *)mac_addr))
+					mac_addr =
+					wlan_vdev_mlme_get_macaddr(vdev);
+
 				peer = wlan_objmgr_get_peer(psoc, pdev_id,
 							    mac_addr,
 							    WLAN_P2P_ID);
 			}
+			wlan_objmgr_vdev_release_ref(vdev, WLAN_P2P_ID);
 		}
 	}
-	wlan_objmgr_vdev_release_ref(vdev, WLAN_P2P_ID);
-
 	if (!peer) {
 		p2p_err("no valid peer");
 		return QDF_STATUS_E_INVAL;

core/wma/src/wma_dev_if.c

@@ -1719,6 +1719,7 @@ static int wma_get_obj_mgr_peer_type(tp_wma_handle wma, uint8_t vdev_id,
 	uint32_t obj_peer_type = 0;
 	struct wlan_objmgr_vdev *vdev;
 	uint8_t *addr;
+	uint8_t *mld_addr;
 
 	vdev = wma->interfaces[vdev_id].vdev;
 	if (!vdev) {
@@ -1726,6 +1727,7 @@ static int wma_get_obj_mgr_peer_type(tp_wma_handle wma, uint8_t vdev_id,
 		return obj_peer_type;
 	}
 	addr = wlan_vdev_mlme_get_macaddr(vdev);
+	mld_addr = wlan_vdev_mlme_get_mldaddr(vdev);
 
 	if (wma_peer_type == WMI_PEER_TYPE_TDLS)
 		return WLAN_PEER_TDLS;
@@ -1733,7 +1735,8 @@ static int wma_get_obj_mgr_peer_type(tp_wma_handle wma, uint8_t vdev_id,
 	if (wma_peer_type == WMI_PEER_TYPE_PASN)
 		return WLAN_PEER_RTT_PASN;
 
-	if (!qdf_mem_cmp(addr, peer_addr, QDF_MAC_ADDR_SIZE)) {
+	if (!qdf_mem_cmp(addr, peer_addr, QDF_MAC_ADDR_SIZE) ||
+	    !qdf_mem_cmp(mld_addr, peer_addr, QDF_MAC_ADDR_SIZE)) {
 		obj_peer_type = WLAN_PEER_SELF;
 	} else if (wma->interfaces[vdev_id].type == WMI_VDEV_TYPE_STA) {
 		if (wma->interfaces[vdev_id].sub_type ==