From a70e315601b1557f3fa53ef26f7d83ca5c7857e5 Mon Sep 17 00:00:00 2001
From: Ajit Pal Singh <ajitpals@codeaurora.org>
Date: Thu, 3 Jan 2019 17:13:41 +0530
Subject: [PATCH] qcacld-3.0: Add config option for CFG_TGT_NUM_MSDU_DESC

Add driver config option for CFG_TGT_NUM_MSDU_DESC

Change-Id: I9c738de779d03819e6920e9d3e260ec3d1fbd524
CRs-Fixed: 2390958
---
 Kbuild                                       | 4 ++++
 components/nan/core/inc/nan_public_structs.h | 4 ++++
 configs/default_defconfig                    | 1 +
 configs/genoa.sdio.debug_defconfig           | 1 +
 configs/genoa.sdio.perf_defconfig            | 1 +
 configs/genoa.usb.debug_defconfig            | 1 +
 configs/genoa.usb.perf_defconfig             | 1 +
 core/wma/src/wma_dev_if.c                    | 4 ++++
 core/wma/src/wma_scan_roam.c                 | 4 ++++
 9 files changed, 21 insertions(+)

diff --git a/Kbuild b/Kbuild
index 5ad44b52f03e..82409c387473 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2552,6 +2552,10 @@ ifdef CONFIG_CFG_GTK_OFFLOAD_MAX_VDEV
 ccflags-y += -DCFG_TGT_DEFAULT_GTK_OFFLOAD_MAX_VDEV=$(CONFIG_CFG_GTK_OFFLOAD_MAX_VDEV)
 endif
 
+ifdef CONFIG_TGT_NUM_MSDU_DESC
+ccflags-y += -DCFG_TGT_NUM_MSDU_DESC=$(CONFIG_TGT_NUM_MSDU_DESC)
+endif
+
 ifdef CONFIG_CFG_ROAM_OFFLOAD_MAX_VDEV
 ccflags-y += -DCFG_TGT_DEFAULT_ROAM_OFFLOAD_MAX_VDEV=$(CONFIG_CFG_ROAM_OFFLOAD_MAX_VDEV)
 endif
diff --git a/components/nan/core/inc/nan_public_structs.h b/components/nan/core/inc/nan_public_structs.h
index 16b12f248b44..13d0d4109a61 100644
--- a/components/nan/core/inc/nan_public_structs.h
+++ b/components/nan/core/inc/nan_public_structs.h
@@ -26,7 +26,11 @@
 #include "qdf_types.h"
 #include "qdf_status.h"
 #include "scheduler_api.h"
+#if defined(CONFIG_HL_SUPPORT)
+#include "wlan_tgt_def_config_hl.h"
+#else
 #include "wlan_tgt_def_config.h"
+#endif
 
 struct wlan_objmgr_psoc;
 struct wlan_objmgr_vdev;
diff --git a/configs/default_defconfig b/configs/default_defconfig
index fea21503ad68..386e0171e955 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -417,6 +417,7 @@ ifeq ($(CONFIG_ROME_IF),sdio)
 	CONFIG_TX_DESC_HI_PRIO_RESERVE := y
 	CONFIG_PER_VDEV_TX_DESC_POOL := y
 	CONFIG_FEATURE_HL_GROUP_CREDIT_FLOW_CONTROL := y
+	CONFIG_TGT_NUM_MSDU_DESC := 0
 endif
 
 ifeq ($(CONFIG_ROME_IF),snoc)
diff --git a/configs/genoa.sdio.debug_defconfig b/configs/genoa.sdio.debug_defconfig
index 8534cdb89680..41d3799efbe5 100644
--- a/configs/genoa.sdio.debug_defconfig
+++ b/configs/genoa.sdio.debug_defconfig
@@ -47,4 +47,5 @@ else
 	QCA_WIFI_FTM_NL80211 :=n
 endif
 CONFIG_LINUX_QCMBR :=y
+CONFIG_TGT_NUM_MSDU_DESC := 0
 ###################################
diff --git a/configs/genoa.sdio.perf_defconfig b/configs/genoa.sdio.perf_defconfig
index f6c435777b78..ac4124bae185 100644
--- a/configs/genoa.sdio.perf_defconfig
+++ b/configs/genoa.sdio.perf_defconfig
@@ -53,4 +53,5 @@ endif
 CONFIG_QCA_WIFI_FTM := n
 QCA_WIFI_FTM_NL80211 := n
 CONFIG_LINUX_QCMBR := n
+CONFIG_TGT_NUM_MSDU_DESC := 0
 ###################################
diff --git a/configs/genoa.usb.debug_defconfig b/configs/genoa.usb.debug_defconfig
index 65a1fbba83cf..295015e89e72 100644
--- a/configs/genoa.usb.debug_defconfig
+++ b/configs/genoa.usb.debug_defconfig
@@ -49,4 +49,5 @@ else
 endif
 CONFIG_LINUX_QCMBR :=y
 CONFIG_QCN7605_SUPPORT := y
+CONFIG_TGT_NUM_MSDU_DESC := 0
 ###################################
diff --git a/configs/genoa.usb.perf_defconfig b/configs/genoa.usb.perf_defconfig
index 77955e14020b..e4f03792969b 100644
--- a/configs/genoa.usb.perf_defconfig
+++ b/configs/genoa.usb.perf_defconfig
@@ -55,4 +55,5 @@ CONFIG_QCA_WIFI_FTM := n
 QCA_WIFI_FTM_NL80211 := n
 CONFIG_LINUX_QCMBR := n
 CONFIG_QCN7605_SUPPORT := y
+CONFIG_TGT_NUM_MSDU_DESC := 0
 ###################################
diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index d3b506083c57..eff98f5b8e55 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -62,7 +62,11 @@
 
 #include "wlan_policy_mgr_api.h"
 #include "wma_nan_datapath.h"
+#if defined(CONFIG_HL_SUPPORT)
+#include "wlan_tgt_def_config_hl.h"
+#else
 #include "wlan_tgt_def_config.h"
+#endif
 #include <wlan_dfs_tgt_api.h>
 #include <cdp_txrx_handle.h>
 #include "wlan_pmo_ucfg_api.h"
diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c
index 216de7d07f28..d71682c6e8d2 100644
--- a/core/wma/src/wma_scan_roam.c
+++ b/core/wma/src/wma_scan_roam.c
@@ -57,7 +57,11 @@
 #include "ol_fw.h"
 
 #include "wma_internal.h"
+#if defined(CONFIG_HL_SUPPORT)
+#include "wlan_tgt_def_config_hl.h"
+#else
 #include "wlan_tgt_def_config.h"
+#endif
 #include "wlan_reg_services_api.h"
 #include "wlan_roam_debug.h"
 #include "wlan_mlme_public_struct.h"