qcacmn: cmn_ops changes in umac, tgt_if for umac-dp decoupling

umac and tgt_if module changes due to umac-dp decoupling changes in
cmn_ops APIs.

Change-Id: If8a7bdb879660f1d15a067ce9c76f96e6dfb7140

target_if/crypto/src/target_if_crypto.c

@@ -114,7 +114,6 @@ QDF_STATUS target_if_crypto_set_key(struct wlan_objmgr_vdev *vdev,
 	enum cdp_sec_type sec_type = cdp_sec_type_none;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	struct cdp_pdev *txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX);
-	struct cdp_vdev *txrx_vdev;
 	uint32_t pn[4] = {0, 0, 0, 0};
 	struct cdp_peer *peer = NULL;
 	uint8_t def_tx_idx;
@@ -157,15 +156,8 @@ QDF_STATUS target_if_crypto_set_key(struct wlan_objmgr_vdev *vdev,
 	}
 	qdf_mem_copy(&params.key_rsc_ctr,
 		     &req->keyrsc[0], sizeof(uint64_t));
-	txrx_vdev = (struct cdp_vdev *)cdp_get_vdev_from_vdev_id(soc,
-				(struct cdp_pdev *)txrx_pdev, params.vdev_id);
-	peer = cdp_peer_find_by_addr(soc, txrx_pdev, req->macaddr);
-
-	if (!txrx_vdev) {
-		target_if_err("Invalid txrx vdev");
-		return QDF_STATUS_E_FAILURE;
-	}
 
+	peer = cdp_peer_find_by_addr(soc, txrx_pdev, req->macaddr);
 	target_if_debug("key_type %d, mac: %02x:%02x:%02x:%02x:%02x:%02x",
 			key_type, req->macaddr[0], req->macaddr[1],
 			req->macaddr[2], req->macaddr[3], req->macaddr[4],
@@ -206,7 +198,8 @@ QDF_STATUS target_if_crypto_set_key(struct wlan_objmgr_vdev *vdev,
 	if (peer) {
 		/* Set PN check & security type in data path */
 		qdf_mem_copy(&pn[0], &params.key_rsc_ctr, sizeof(pn));
-		cdp_set_pn_check(soc, txrx_vdev, peer, sec_type, pn);
+		cdp_set_pn_check(soc, vdev->vdev_objmgr.vdev_id, req->macaddr,
+				 sec_type, pn);
 		cdp_set_key(soc, peer, pairwise, (uint32_t *)(req->keyval +
 			    WLAN_CRYPTO_IV_SIZE + WLAN_CRYPTO_MIC_LEN));
 	} else {

umac/mlme/mlme_objmgr/dispatcher/src/wlan_vdev_mlme_main.c

@@ -138,7 +138,6 @@ static QDF_STATUS mlme_vdev_obj_destroy_handler(struct wlan_objmgr_vdev *vdev,
 	struct vdev_mlme_obj *vdev_mlme;
 	struct wlan_objmgr_psoc *psoc;
 	struct cdp_soc_t *soc_txrx_handle;
-	struct cdp_vdev *vdev_txrx_handle;
 
 	if (!vdev) {
 		mlme_err(" VDEV is NULL");
@@ -153,10 +152,9 @@ static QDF_STATUS mlme_vdev_obj_destroy_handler(struct wlan_objmgr_vdev *vdev,
 
 	psoc = wlan_vdev_get_psoc(vdev);
 	soc_txrx_handle = (struct cdp_soc_t *)wlan_psoc_get_dp_handle(psoc);
-	vdev_txrx_handle = wlan_vdev_get_dp_handle(vdev);
-	if (soc_txrx_handle && vdev_txrx_handle) {
+	if (soc_txrx_handle) {
 		wlan_vdev_set_dp_handle(vdev, NULL);
-		cdp_vdev_detach(soc_txrx_handle, vdev_txrx_handle,
+		cdp_vdev_detach(soc_txrx_handle, wlan_vdev_get_id(vdev),
 				NULL, NULL);
 	}
 

umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mgr_tgt_if_tx_api.c

@@ -57,7 +57,6 @@ QDF_STATUS tgt_vdev_mgr_create_send(
 	struct wlan_objmgr_pdev *pdev;
 	struct wlan_objmgr_vdev *vdev;
 	ol_txrx_soc_handle soc_txrx_handle;
-	struct cdp_pdev *pdev_txrx_handle;
 	struct cdp_vdev *vdev_txrx_handle;
 	enum wlan_op_mode cdp_txrx_opmode;
 	enum wlan_op_subtype cdp_txrx_subtype;
@@ -95,12 +94,11 @@ QDF_STATUS tgt_vdev_mgr_create_send(
 	vdev_addr = wlan_vdev_mlme_get_macaddr(vdev);
 	pdev = wlan_vdev_get_pdev(vdev);
 	soc_txrx_handle = wlan_psoc_get_dp_handle(psoc);
-	pdev_txrx_handle = wlan_pdev_get_dp_handle(pdev);
-	if (!soc_txrx_handle || !pdev_txrx_handle)
+	if (!soc_txrx_handle)
 		return QDF_STATUS_E_FAILURE;
 
 	vdev_txrx_handle = cdp_vdev_attach(soc_txrx_handle,
-					   pdev_txrx_handle,
+					   wlan_objmgr_pdev_get_pdev_id(pdev),
 					   vdev_addr, vdev_id,
 					   cdp_txrx_opmode,
 					   cdp_txrx_subtype);