wireless: bcmdhd: make wext and cfg80211 choices
Mursalin Akon [Thu, 8 Mar 2012 22:00:21 +0000 (14:00 -0800)]
make wext and cfg80211 integration from
bcmdhd choices

Bug 924521

Change-Id: Ie0c46159003985e4e4b29b2809fe881ce924dbee
Signed-off-by: Mursalin Akon <makon@nvidia.com>
Reviewed-on: http://git-master/r/88908
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Allen Martin <amartin@nvidia.com>
Tested-by: Gerrit_Virtual_Submit

drivers/net/wireless/bcmdhd/Kconfig
drivers/net/wireless/bcmdhd/Makefile

index ee71739..4c3461a 100644 (file)
@@ -24,14 +24,31 @@ config BCMDHD_NVRAM_DIR
        ---help---
          Path to the calibration file.
 
+choice
+       prompt "Select API"
+       depends on BCMDHD
+       default BCMDHD_NOAPI
+
 config BCMDHD_WEXT
        bool "Enable WEXT support"
-       depends on BCMDHD && CFG80211 = n
        select WIRELESS_EXT
        select WEXT_PRIV
        help
          Enables WEXT support
 
+config BCMDHD_CFG80211
+       bool "Enable CFG80211 support"
+       depends on CFG80211
+       help
+         Enables CFG80211 support
+
+config BCMDHD_NOAPI
+       bool "No wireless API"
+       help
+         No wireless API is needed
+
+endchoice
+
 config BCMDHD_WIFI_CONTROL_FUNC
        bool "Use bcmdhd_wlan device"
        depends on BCMDHD
index 6f5a554..918e59f 100644 (file)
@@ -37,14 +37,17 @@ DHDOFILES = aiutils.o bcmsdh_sdmmc_linux.o dhd_linux.o siutils.o bcmutils.o   \
 
 obj-$(CONFIG_BCMDHD) += bcmdhd.o
 bcmdhd-objs += $(DHDOFILES)
-ifneq ($(CONFIG_BCMDHD_WEXT),)
+
+ifeq ($(CONFIG_BCMDHD_WEXT),y)
 bcmdhd-objs += wl_iw.o
 DHDCFLAGS += -DSOFTAP
 endif
-ifneq ($(CONFIG_CFG80211),)
+
+ifeq ($(CONFIG_BCMDHD_CFG80211),y)
 bcmdhd-objs += wl_cfg80211.o wl_cfgp2p.o dhd_linux_mon.o
 DHDCFLAGS += -DWL_CFG80211
 endif
+
 EXTRA_CFLAGS = $(DHDCFLAGS)
 ifeq ($(CONFIG_BCMDHD),m)
 EXTRA_LDFLAGS += --strip-debug