Просмотр исходного кода

qcacld-3.0: Fix compilation issue for legacy DP

As part of DP CP interaction UMAC pdev objmgr handle is
passed at dp pdev attach. But in legacy DP config handle
is passed which leads to compilation issue. In this change
handle compilation issue by type casing handles.

Change-Id: I40986c8fd07d007aced91621f338f31332be6782
CRs-Fixed: 2260753
Sravan Kumar Kairam 6 лет назад
Родитель
Сommit
1cbfb00f1c
2 измененных файлов с 11 добавлено и 9 удалено
  1. 1 1
      core/cds/src/cds_api.c
  2. 10 8
      core/dp/txrx/ol_txrx.c

+ 1 - 1
core/cds/src/cds_api.c

@@ -706,7 +706,7 @@ QDF_STATUS cds_dp_open(struct wlan_objmgr_psoc *psoc)
 
 	cds_set_context(QDF_MODULE_ID_TXRX,
 		cdp_pdev_attach(cds_get_context(QDF_MODULE_ID_SOC),
-			gp_cds_context->cfg_ctx,
+			(struct cdp_ctrl_objmgr_pdev *)gp_cds_context->cfg_ctx,
 			gp_cds_context->htc_ctx,
 			gp_cds_context->qdf_ctx, 0));
 	if (!gp_cds_context->pdev_txrx_ctx) {

+ 10 - 8
core/dp/txrx/ol_txrx.c

@@ -1409,10 +1409,12 @@ static inline void ol_txrx_debugfs_exit(ol_txrx_pdev_handle pdev)
  *		  NULL for failure
  */
 static struct cdp_pdev *
-ol_txrx_pdev_attach(ol_txrx_soc_handle soc, struct cdp_cfg *ctrl_pdev,
+ol_txrx_pdev_attach(ol_txrx_soc_handle soc,
+		    struct cdp_ctrl_objmgr_pdev *ctrl_pdev,
 		    HTC_HANDLE htc_pdev, qdf_device_t osdev, uint8_t pdev_id)
 {
 	struct ol_txrx_pdev_t *pdev;
+	struct cdp_cfg *cfg_pdev = (struct cdp_cfg *)ctrl_pdev;
 	int i, tid;
 
 	pdev = qdf_mem_malloc(sizeof(*pdev));
@@ -1420,22 +1422,22 @@ ol_txrx_pdev_attach(ol_txrx_soc_handle soc, struct cdp_cfg *ctrl_pdev,
 		goto fail0;
 
 	/* init LL/HL cfg here */
-	pdev->cfg.is_high_latency = ol_cfg_is_high_latency(ctrl_pdev);
+	pdev->cfg.is_high_latency = ol_cfg_is_high_latency(cfg_pdev);
 	/*
 	 * Credit reporting through HTT_T2H_MSG_TYPE_TX_CREDIT_UPDATE_IND
 	 * enabled or not.
 	 */
 	pdev->cfg.credit_update_enabled =
-		ol_cfg_is_credit_update_enabled(ctrl_pdev);
+		ol_cfg_is_credit_update_enabled(cfg_pdev);
 
 	/* Explicitly request TX Completions from FW */
 	pdev->cfg.request_tx_comp = cds_is_ptp_rx_opt_enabled() ||
 		cds_is_packet_log_enabled();
 
-	pdev->cfg.default_tx_comp_req = !ol_cfg_tx_free_at_download(ctrl_pdev);
+	pdev->cfg.default_tx_comp_req = !ol_cfg_tx_free_at_download(cfg_pdev);
 
 	/* store provided params */
-	pdev->ctrl_pdev = ctrl_pdev;
+	pdev->ctrl_pdev = cfg_pdev;
 	pdev->osdev = osdev;
 
 	for (i = 0; i < htt_num_sec_types; i++)
@@ -1459,7 +1461,7 @@ ol_txrx_pdev_attach(ol_txrx_soc_handle soc, struct cdp_cfg *ctrl_pdev,
 	qdf_atomic_init(&pdev->target_tx_credit);
 	qdf_atomic_init(&pdev->orig_target_tx_credit);
 
-	if (ol_cfg_is_high_latency(ctrl_pdev)) {
+	if (ol_cfg_is_high_latency(cfg_pdev)) {
 		qdf_spinlock_create(&pdev->tx_queue_spinlock);
 		pdev->tx_sched.scheduler = ol_tx_sched_attach(pdev);
 		if (pdev->tx_sched.scheduler == NULL)
@@ -1469,7 +1471,7 @@ ol_txrx_pdev_attach(ol_txrx_soc_handle soc, struct cdp_cfg *ctrl_pdev,
 	ol_txrx_pdev_grp_stats_init(pdev);
 
 	pdev->htt_pdev =
-		htt_pdev_alloc(pdev, ctrl_pdev, htc_pdev, osdev);
+		htt_pdev_alloc(pdev, cfg_pdev, htc_pdev, osdev);
 	if (!pdev->htt_pdev)
 		goto fail3;
 
@@ -1503,7 +1505,7 @@ fail3:
 	ol_txrx_peer_find_detach(pdev);
 
 fail2:
-	if (ol_cfg_is_high_latency(ctrl_pdev))
+	if (ol_cfg_is_high_latency(cfg_pdev))
 		qdf_spinlock_destroy(&pdev->tx_queue_spinlock);
 
 fail1: