Browse Source

Merge "qca-wifi: changes for removal of ctrl_path handles from dp"

Linux Build Service Account 5 years ago
parent
commit
d462c8ff28
2 changed files with 6 additions and 4 deletions
  1. 3 2
      dp/wifi3.0/dp_rx_fst.c
  2. 3 2
      dp/wifi3.0/dp_txrx_wds.h

+ 3 - 2
dp/wifi3.0/dp_rx_fst.c

@@ -513,8 +513,9 @@ QDF_STATUS dp_rx_fst_attach(struct dp_soc *soc, struct dp_pdev *pdev)
 		return QDF_STATUS_E_NOSUPPORT;
 		return QDF_STATUS_E_NOSUPPORT;
 	}
 	}
 
 
-	if (!wlan_psoc_nif_fw_ext_cap_get((void *)pdev->ctrl_pdev,
-					  WLAN_SOC_CEXT_RX_FSE_SUPPORT)) {
+	if (!wlan_psoc_nif_fw_ext_cap_get(
+				(struct wlan_objmgr_psoc *)soc->ctrl_psoc,
+				WLAN_SOC_CEXT_RX_FSE_SUPPORT)) {
 		QDF_TRACE(QDF_MODULE_ID_ANY, QDF_TRACE_LEVEL_ERROR,
 		QDF_TRACE(QDF_MODULE_ID_ANY, QDF_TRACE_LEVEL_ERROR,
 			  "rx fse disabled in FW\n");
 			  "rx fse disabled in FW\n");
 		wlan_cfg_set_rx_flow_tag_enabled(cfg, false);
 		wlan_cfg_set_rx_flow_tag_enabled(cfg, false);

+ 3 - 2
dp/wifi3.0/dp_txrx_wds.h

@@ -262,8 +262,9 @@ dp_rx_wds_add_or_update_ast(struct dp_soc *soc, struct dp_peer *ta_peer,
 			sa_peer->delete_in_progress = true;
 			sa_peer->delete_in_progress = true;
 			if (soc->cdp_soc.ol_ops->peer_sta_kickout) {
 			if (soc->cdp_soc.ol_ops->peer_sta_kickout) {
 				soc->cdp_soc.ol_ops->peer_sta_kickout(
 				soc->cdp_soc.ol_ops->peer_sta_kickout(
-						sa_peer->vdev->pdev->ctrl_pdev,
-						wds_src_mac);
+					soc->ctrl_psoc,
+					sa_peer->vdev->pdev->pdev_id,
+					wds_src_mac);
 			}
 			}
 		}
 		}
 	}
 	}