diff options
| author | Eric Brower <ebrower@nvidia.com> | 2012-01-20 19:08:57 -0800 |
|---|---|---|
| committer | Lokesh Pathak <lpathak@nvidia.com> | 2012-02-10 08:35:41 -0800 |
| commit | 3dfb35b8d459d9055517ee8951af514f4e237828 (patch) | |
| tree | 9690ee43705904ca00a6dfd17e94ddde38b7422e /drivers/net | |
| parent | c892abe5e61645f41dca11189a1b473f26e73c17 (diff) | |
net: wireless: bcm4329: move CSCAN enable to a Kconfig option
Move CSCAN driver compilation flag to CONFIG_BCM4329_CSCAN_ENABLE
Kconfig option; CSCAN is not supported in all userspace environments.
The driver implementation of PNO_SUPPORT has a dependency on CSCAN, so
make that option controlled by CONFIG_BCM4329_CSCAN_ENABLE.
Bug 929960
Signed-off-by: Eric Brower <ebrower@nvidia.com>
(cherry picked from commit af965bf9a82041353a322a3205574ff402c6ff05)
Reviewed-on: http://git-master/r/77890
(cherry picked from commit 2f641aa2781afc80ed496978c55fc83aa251f727)
Change-Id: Iaf9ba7c7122571c7b5c5a670e0b9330d53a8940e
Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-on: http://git-master/r/82721
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/bcm4329/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/bcm4329/Makefile | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcm4329/Kconfig b/drivers/net/wireless/bcm4329/Kconfig index 79d701b698e1..a04ba4c4d4c3 100644 --- a/drivers/net/wireless/bcm4329/Kconfig +++ b/drivers/net/wireless/bcm4329/Kconfig @@ -72,4 +72,11 @@ config BCM4329_GET_CUSTOM_MAC_ENABLE default n ---help--- Use mac address provided by bcm4329_wlan platform device. + +config BCM4329_CSCAN_ENABLE + bool "Enable Combo Scan" + depends on BCM4329 + default n + ---help--- + Enable Combo Scan endif diff --git a/drivers/net/wireless/bcm4329/Makefile b/drivers/net/wireless/bcm4329/Makefile index 7714efce4af5..60297ece4907 100644 --- a/drivers/net/wireless/bcm4329/Makefile +++ b/drivers/net/wireless/bcm4329/Makefile @@ -5,8 +5,8 @@ DHDCFLAGS = -DLINUX -DBCMDRIVER -DBCMDONGLEHOST -DDHDTHREAD -DBCMWPA2 \ -DSHOW_EVENTS -DBCMSDIO -DDHD_GPL -DBCMLXSDMMC -DBCMPLATFORM_BUS \ -Wall -Wstrict-prototypes -Werror -DCUSTOMER_HW2 -DMMC_SDIO_ABORT \ -DDHD_DEBUG_TRAP -DSOFTAP -DEMBEDDED_PLATFORM -DARP_OFFLOAD_SUPPORT \ - -DPKT_FILTER_SUPPORT -DSET_RANDOM_MAC_SOFTAP -DCSCAN \ - -DKEEP_ALIVE -DPNO_SUPPORT \ + -DPKT_FILTER_SUPPORT -DSET_RANDOM_MAC_SOFTAP \ + -DKEEP_ALIVE \ -Idrivers/net/wireless/bcm4329 -Idrivers/net/wireless/bcm4329/include ifeq ($(CONFIG_BCM4329_WIFI_CONTROL_FUNC),y) @@ -31,6 +31,10 @@ DHDCFLAGS += -DHW_OOB else DHDCFLAGS += -DSDIO_ISR_THREAD endif +ifeq ($(CONFIG_BCM4329_CSCAN_ENABLE),y) +# implementation of PNO_SUPPORT currently requires CSCAN +DHDCFLAGS += -DCSCAN -DPNO_SUPPORT +endif ifeq ($(TARGET_USE_NEW_TOOLCHAIN),1) # gcc-4.6.1 warns a lot more than previous compilers. |