summaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2012-03-12 15:45:04 -0700
committerOm Prakash Singh <omp@nvidia.com>2012-06-15 14:15:14 +0530
commitc4418cfa10725ad06682154da6d33ae73555966f (patch)
tree5722c05465bc9ef607f079483f7489a302d40ea0 /drivers/net/wireless
parentd25b99292335e7f4601002921f8b4a8a9c887593 (diff)
net: wireless: bcmdhd: Add sched-scan config option
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/bcmdhd/Kconfig7
-rw-r--r--drivers/net/wireless/bcmdhd/Makefile5
2 files changed, 11 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcmdhd/Kconfig b/drivers/net/wireless/bcmdhd/Kconfig
index d66bc996dfdc..dc490c3ecf8c 100644
--- a/drivers/net/wireless/bcmdhd/Kconfig
+++ b/drivers/net/wireless/bcmdhd/Kconfig
@@ -43,6 +43,13 @@ config DHD_USE_STATIC_BUF
---help---
Use memory preallocated in platform
+config DHD_USE_SCHED_SCAN
+ bool "Use CFG80211 sched scan"
+ depends on BCMDHD && CFG80211
+ default n
+ ---help---
+ Use CFG80211 sched scan
+
config BCMDHD_CFG80211
bool "Enable CFG80211 support"
depends on CFG80211
diff --git a/drivers/net/wireless/bcmdhd/Makefile b/drivers/net/wireless/bcmdhd/Makefile
index 35f9c609c9e9..13b62ccfd4be 100644
--- a/drivers/net/wireless/bcmdhd/Makefile
+++ b/drivers/net/wireless/bcmdhd/Makefile
@@ -52,7 +52,10 @@ ifeq ($(CONFIG_BCMDHD_CFG80211),y)
bcmdhd-objs += wl_cfg80211.o wl_cfgp2p.o wl_linux_mon.o
DHDCFLAGS += -DWL_CFG80211
endif
-
+ifneq ($(CONFIG_DHD_USE_SCHED_SCAN),)
+DHDCFLAGS += -DWL_SCHED_SCAN
+else
+endif
EXTRA_CFLAGS = $(DHDCFLAGS)
ifeq ($(CONFIG_BCMDHD),m)
EXTRA_LDFLAGS += --strip-debug