Jelajahi Sumber

qcacld-3.0: Support ROME SDIO

Function ol_txrx_hl_tdls_flag_reset will call function
ol_txrx_get_vdev_from_vdev_id, it will return NULL vdev
because ol_txrx_hl_tdls_flag_reset is called before
TAILQ_INSERT_TAIL(vdev).
So, move it after TAILQ_INSERT_TAIL(vdev).

Redefinition of 'pld_pcie_register_driver' when
CONFIG_PLD_PCIE_CNSS not defined. For Hastings WHUNT,
HIF_PCI is defined but CONFIG_PLD_PCIE_CNSS is not defined.
So, replace CONFIG_PLD_PCIE_CNSS by HIF_PCI and
CONFIG_PLD_PCIE_FW_SIM.

Change-Id: I05e58516efe6a9a445168a27df9e0cfc9de2e50c
CRs-Fixed: 2589802
Yu Ouyang 5 tahun lalu
induk
melakukan
36b48bf65a
2 mengubah file dengan 3 tambahan dan 3 penghapusan
  1. 2 2
      core/dp/txrx/ol_txrx.c
  2. 1 1
      core/pld/src/pld_pcie.h

+ 2 - 2
core/dp/txrx/ol_txrx.c

@@ -1734,8 +1734,6 @@ ol_txrx_vdev_attach(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
 	TAILQ_INIT(&vdev->peer_list);
 	vdev->last_real_peer = NULL;
 
-	ol_txrx_hl_tdls_flag_reset(soc_hdl, vdev_id, false);
-
 #ifdef QCA_IBSS_SUPPORT
 	vdev->ibss_peer_num = 0;
 	vdev->ibss_peer_heart_beat_timer = 0;
@@ -1791,6 +1789,8 @@ ol_txrx_vdev_attach(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
 	if (QDF_GLOBAL_MONITOR_MODE == cds_get_conparam())
 		pdev->monitor_vdev = vdev;
 
+	ol_txrx_hl_tdls_flag_reset(soc_hdl, vdev_id, false);
+
 	ol_txrx_dbg(
 		   "Created vdev %pK ("QDF_MAC_ADDR_STR")\n",
 		   vdev,

+ 1 - 1
core/pld/src/pld_pcie.h

@@ -37,7 +37,7 @@
 
 #endif
 
-#ifndef CONFIG_PLD_PCIE_CNSS
+#if !defined(HIF_PCI) || defined(CONFIG_PLD_PCIE_FW_SIM)
 static inline int pld_pcie_register_driver(void)
 {
 	return 0;