Преглед на файлове

qcacmn: Fix wlan_cfg file inclusion and remove duplicate static API

Due to issues in Kbuild wlan_cfg was included using relative path.
Also getting rid of a duplicate static function definition in
dp_peer.c.

Change-Id: Ie0883340a9143b739119f18c8871b4baa9787980
CRs-Fixed: 2005582
Ravi Joshi преди 8 години
родител
ревизия
af9ace8358
променени са 3 файла, в които са добавени 4 реда и са изтрити 8 реда
  1. 2 1
      dp/wifi3.0/dp_main.c
  2. 1 6
      dp/wifi3.0/dp_peer.c
  3. 1 1
      dp/wifi3.0/dp_tx.c

+ 2 - 1
dp/wifi3.0/dp_main.c

@@ -28,8 +28,9 @@
 #include "dp_internal.h"
 #include "dp_internal.h"
 #include "dp_tx.h"
 #include "dp_tx.h"
 #include "dp_rx.h"
 #include "dp_rx.h"
-#include "../../wlan_cfg/wlan_cfg.h"
 #include <cdp_txrx_handle.h>
 #include <cdp_txrx_handle.h>
+#include <wlan_cfg.h>
+
 #define DP_INTR_POLL_TIMER_MS	100
 #define DP_INTR_POLL_TIMER_MS	100
 /**
 /**
  * dp_setup_srng - Internal function to setup SRNG rings used by data path
  * dp_setup_srng - Internal function to setup SRNG rings used by data path

+ 1 - 6
dp/wifi3.0/dp_peer.c

@@ -28,12 +28,7 @@
 #include <cds_ieee80211_common.h>
 #include <cds_ieee80211_common.h>
 #endif
 #endif
 #include <cdp_txrx_handle.h>
 #include <cdp_txrx_handle.h>
-/* Temporary definitions to be moved to wlan_cfg */
-static inline uint32_t wlan_cfg_max_peer_id(void *wlan_cfg_ctx)
-{
-	/* TODO: This should be calculated based on target capabilities */
-	return 2048;
-}
+#include <wlan_cfg.h>
 
 
 static inline int dp_peer_find_mac_addr_cmp(
 static inline int dp_peer_find_mac_addr_cmp(
 	union dp_align_mac_addr *mac_addr1,
 	union dp_align_mac_addr *mac_addr1,

+ 1 - 1
dp/wifi3.0/dp_tx.c

@@ -23,7 +23,7 @@
 #include "hal_tx.h"
 #include "hal_tx.h"
 #include "qdf_mem.h"
 #include "qdf_mem.h"
 #include "qdf_nbuf.h"
 #include "qdf_nbuf.h"
-#include "../../wlan_cfg/wlan_cfg.h"
+#include <wlan_cfg.h>
 
 
 #ifdef TX_PER_PDEV_DESC_POOL
 #ifdef TX_PER_PDEV_DESC_POOL
 	#define DP_TX_GET_DESC_POOL_ID(vdev) (vdev->pdev->pdev_id)
 	#define DP_TX_GET_DESC_POOL_ID(vdev) (vdev->pdev->pdev_id)