summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYun Park <yunp@qca.qualcomm.com>2016-03-24 17:20:22 -0700
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-03-29 16:53:27 +0530
commitf3729b071f98cec5ca38225e8bca1b643ba71a7d (patch)
treea129fe8ed15377da08ba35a4a586a2369c47e48e
parentc2c418b8d16455b8b480887a6e3738a8af6a4016 (diff)
qcacld-2.0: Fix build error for Dual-Wifi Bring up
Remove EXPORT_SYMBOL which causes a namespace collision. Set FEATURE_BUS_BANDWIDTH for SDIO WLAN driver. Change-Id: I802b46de14924bf0b4052832dd82cbcb05bac57a CRs-Fixed: 995513
-rw-r--r--CORE/CLD_TXRX/TXRX/ol_cfg.c1
-rw-r--r--CORE/SERVICES/COMMON/adf/adf_nbuf.c25
-rw-r--r--CORE/SERVICES/COMMON/adf/linux/adf_os_defer_pvt.c2
-rw-r--r--CORE/SERVICES/COMMON/adf/linux/adf_os_lock_pvt.c3
-rw-r--r--CORE/SERVICES/COMMON/adf/linux/adf_os_mem_pvt.c5
-rw-r--r--Kbuild5
6 files changed, 4 insertions, 37 deletions
diff --git a/CORE/CLD_TXRX/TXRX/ol_cfg.c b/CORE/CLD_TXRX/TXRX/ol_cfg.c
index 9efd1ce2728a..1f9a054d2b46 100644
--- a/CORE/CLD_TXRX/TXRX/ol_cfg.c
+++ b/CORE/CLD_TXRX/TXRX/ol_cfg.c
@@ -31,7 +31,6 @@
unsigned int vow_config = 0;
module_param(vow_config, uint, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
MODULE_PARM_DESC(vow_config, "Do VoW Configuration");
-EXPORT_SYMBOL(vow_config);
#ifdef QCA_SUPPORT_TXRX_HL_BUNDLE
/**
diff --git a/CORE/SERVICES/COMMON/adf/adf_nbuf.c b/CORE/SERVICES/COMMON/adf/adf_nbuf.c
index 030dc39b59ea..61f68f06f286 100644
--- a/CORE/SERVICES/COMMON/adf/adf_nbuf.c
+++ b/CORE/SERVICES/COMMON/adf/adf_nbuf.c
@@ -606,28 +606,3 @@ int adf_nbuf_update_radiotap(struct mon_rx_status *rx_status, adf_nbuf_t nbuf,
rtap_hdr_len, rtap_len - rtap_hdr_len);
return rtap_len;
}
-
-EXPORT_SYMBOL(__adf_nbuf_alloc);
-#ifdef QCA_ARP_SPOOFING_WAR
-EXPORT_SYMBOL(__adf_rx_nbuf_alloc);
-#endif
-EXPORT_SYMBOL(__adf_nbuf_free);
-EXPORT_SYMBOL(__adf_nbuf_ref);
-EXPORT_SYMBOL(__adf_nbuf_shared);
-EXPORT_SYMBOL(__adf_nbuf_frag_info);
-EXPORT_SYMBOL(__adf_nbuf_dmamap_create);
-EXPORT_SYMBOL(__adf_nbuf_dmamap_destroy);
-EXPORT_SYMBOL(__adf_nbuf_map);
-EXPORT_SYMBOL(__adf_nbuf_unmap);
-EXPORT_SYMBOL(__adf_nbuf_map_single);
-EXPORT_SYMBOL(__adf_nbuf_unmap_single);
-EXPORT_SYMBOL(__adf_nbuf_dmamap_info);
-EXPORT_SYMBOL(__adf_nbuf_set_rx_cksum);
-EXPORT_SYMBOL(__adf_nbuf_get_tx_cksum);
-EXPORT_SYMBOL(__adf_nbuf_get_vlan_info);
-EXPORT_SYMBOL(__adf_nbuf_get_tid);
-EXPORT_SYMBOL(__adf_nbuf_set_tid);
-EXPORT_SYMBOL(__adf_nbuf_get_exemption_type);
-EXPORT_SYMBOL(__adf_nbuf_dmamap_set_cb);
-EXPORT_SYMBOL(__adf_nbuf_is_dhcp_pkt);
-EXPORT_SYMBOL(__adf_nbuf_is_eapol_pkt);
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_defer_pvt.c b/CORE/SERVICES/COMMON/adf/linux/adf_os_defer_pvt.c
index e54b99e83052..a47c2d991796 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_defer_pvt.c
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_defer_pvt.c
@@ -56,5 +56,3 @@ __adf_os_defer_delayed_func(struct work_struct *dwork)
}
ctx->fn(ctx->arg);
}
-EXPORT_SYMBOL(__adf_os_defer_func);
-EXPORT_SYMBOL(__adf_os_defer_delayed_func);
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_lock_pvt.c b/CORE/SERVICES/COMMON/adf/linux/adf_os_lock_pvt.c
index c24684f1c196..136c5d54a34a 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_lock_pvt.c
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_lock_pvt.c
@@ -29,6 +29,3 @@
#include <linux/module.h>
#include "adf_os_lock.h"
-
-EXPORT_SYMBOL(adf_os_spin_lock_bh_outline);
-EXPORT_SYMBOL(adf_os_spin_unlock_bh_outline);
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_mem_pvt.c b/CORE/SERVICES/COMMON/adf/linux/adf_os_mem_pvt.c
index 511f97a5de6d..b827f28c0238 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_mem_pvt.c
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_mem_pvt.c
@@ -32,8 +32,3 @@
int adf_dbg_mask;
adf_os_declare_param(adf_dbg_mask, ADF_OS_PARAM_TYPE_INT32);
-
-
-EXPORT_SYMBOL(adf_os_mem_alloc_outline);
-EXPORT_SYMBOL(adf_os_mem_free_outline);
-EXPORT_SYMBOL(adf_os_mem_zero_outline);
diff --git a/Kbuild b/Kbuild
index b0a025ce9d83..1af5d42601d2 100644
--- a/Kbuild
+++ b/Kbuild
@@ -995,10 +995,13 @@ ifeq ($(CONFIG_ARCH_MDM9607), y)
ifeq ($(CONFIG_QCA_WIFI_SDIO), 1)
CDEFINES += -DDEBUG_HL_LOGGING
CDEFINES += -DHIF_SYNC_READ
-CDEFINES += -DFEATURE_BUS_BANDWIDTH
endif
endif
+ifeq ($(CONFIG_QCA_WIFI_SDIO), 1)
+CDEFINES += -DFEATURE_BUS_BANDWIDTH
+endif
+
ifeq ($(CONFIG_SUPPORT_TXRX_HL_BUNDLE), 1)
CDEFINES += -DQCA_SUPPORT_TXRX_HL_BUNDLE
endif