net: wireless: bcmdhd: Add CONFIG_DHD_ENABLE_P2P Kconfig option

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/drivers/net/wireless/bcmdhd/Kconfig b/drivers/net/wireless/bcmdhd/Kconfig
index 231ae187f40447898277c79ead9554f7621f04f7..8b6b92f624374ae43fa3f20034c2faafda207fb8 100644 (file)
--- a/drivers/net/wireless/bcmdhd/Kconfig
+++ b/drivers/net/wireless/bcmdhd/Kconfig
@@ -45,3 +45,10 @@ config DHD_USE_SCHED_SCAN
        default n
        ---help---
          Use CFG80211 sched scan
+
+config DHD_ENABLE_P2P
+       bool "Enable Wifi Direct"
+       depends on BCMDHD && CFG80211
+       default n
+       ---help---
+         Use Enable Wifi Direct

diff --git a/drivers/net/wireless/bcmdhd/Makefile b/drivers/net/wireless/bcmdhd/Makefile
index bd0886febe500eab2cbbf62405e3c70b5927a763..eda803e3ca798520dbdf4e73580175b09f2a7116 100644 (file)
--- a/drivers/net/wireless/bcmdhd/Makefile
+++ b/drivers/net/wireless/bcmdhd/Makefile
@@ -8,7 +8,7 @@ DHDCFLAGS = -Wall -Wstrict-prototypes -Dlinux -DBCMDRIVER                     \
        -DNEW_COMPAT_WIRELESS -DWIFI_ACT_FRAME -DARP_OFFLOAD_SUPPORT          \
        -DKEEP_ALIVE -DCSCAN -DGET_CUSTOM_MAC_ENABLE -DPKT_FILTER_SUPPORT     \
        -DEMBEDDED_PLATFORM -DENABLE_INSMOD_NO_FW_LOAD -DPNO_SUPPORT          \
-       -DSET_RANDOM_MAC_SOFTAP -DWL_ENABLE_P2P_IF -DWL_CFG80211_STA_EVENT    \
+       -DSET_RANDOM_MAC_SOFTAP -DWL_CFG80211_STA_EVENT                       \
        -Idrivers/net/wireless/bcmdhd -Idrivers/net/wireless/bcmdhd/include
 
 DHDOFILES = aiutils.o bcmsdh_sdmmc_linux.o dhd_linux.o siutils.o bcmutils.o   \
@@ -28,7 +28,9 @@ DHDCFLAGS += -DWL_CFG80211
 endif
 ifneq ($(CONFIG_DHD_USE_SCHED_SCAN),)
 DHDCFLAGS += -DWL_SCHED_SCAN
-else
+endif
+ifneq ($(CONFIG_DHD_ENABLE_P2P),)
+DHDCFLAGS += -DWL_ENABLE_P2P_IF
 endif
 EXTRA_CFLAGS = $(DHDCFLAGS)
 ifeq ($(CONFIG_BCMDHD),m)