diff options
| author | Nitin Bindal <nbindal@nvidia.com> | 2012-04-11 16:07:00 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-04-13 20:50:28 -0700 |
| commit | 13004d46f67c5b181a268dfb4322faacd812ead4 (patch) | |
| tree | 3d118a964af462890d04cd499ec92a3b015f769f /drivers/net/wireless | |
| parent | 00ce2c84727831a4dcf6ddbcc5ab555cc24fa112 (diff) | |
drivers: net: bcmdhd: enable CRD through kernel config
Enable Custom Regulatory Domain(CRD) support, only if
BCMDHD_CUSTOM_REGULATORY_DOMAIN kernel config is set.
By default BCMDHD_CUSTOM_REGULATORY_DOMAIN is enabled.
Bug 947472
Change-Id: I40ea3c3c531d4e309c0928db396b9cc832be43cc
Signed-off-by: Nitin Bindal <nbindal@nvidia.com>
Reviewed-on: http://git-master/r/88266
Reviewed-by: Rakesh Kumar <krakesh@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Narayan Reddy <narayanr@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/Makefile | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_cfg80211.c | 2 |
3 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcmdhd/Kconfig b/drivers/net/wireless/bcmdhd/Kconfig index 4c3461a67f4a..427cd9911569 100644 --- a/drivers/net/wireless/bcmdhd/Kconfig +++ b/drivers/net/wireless/bcmdhd/Kconfig @@ -77,3 +77,10 @@ config BCMDHD_INSMOD_NO_FW_LOAD default n ---help--- Enable delayes firmware + +config BCMDHD_CUSTOM_REGULATORY_DOMAIN + bool "Enable Custom Regulatory Domain" + depends on BCMDHD + default y + ---help--- + Use Custom Regulatory Domain set by driver. diff --git a/drivers/net/wireless/bcmdhd/Makefile b/drivers/net/wireless/bcmdhd/Makefile index 918e59fb4953..85e93f7a56c3 100644 --- a/drivers/net/wireless/bcmdhd/Makefile +++ b/drivers/net/wireless/bcmdhd/Makefile @@ -30,6 +30,10 @@ ifeq ($(CONFIG_BCMDHD_INSMOD_NO_FW_LOAD),y) DHDCFLAGS += -DENABLE_INSMOD_NO_FW_LOAD endif +ifeq ($(CONFIG_BCMDHD_CUSTOM_REGULATORY_DOMAIN),y) +DHDCFLAGS += -DENABLE_CUSTOM_REGULATORY_DOMAIN +endif + DHDOFILES = aiutils.o bcmsdh_sdmmc_linux.o dhd_linux.o siutils.o bcmutils.o \ dhd_linux_sched.o bcmwifi.o dhd_sdio.o bcmevent.o dhd_bta.o hndpmu.o \ bcmsdh.o dhd_cdc.o bcmsdh_linux.o dhd_common.o linux_osl.o \ diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index daa7d2605aaf..04affb50b18b 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -4086,9 +4086,11 @@ static struct wireless_dev *wl_alloc_wdev(struct device *sdiofunc_dev) #endif WIPHY_FLAG_4ADDR_STATION; +#ifdef ENABLE_CUSTOM_REGULATORY_DOMAIN WL_DBG(("Registering custom regulatory)\n")); wdev->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY; wiphy_apply_custom_regulatory(wdev->wiphy, &brcm_regdom); +#endif /* Now we can register wiphy with cfg80211 module */ err = wiphy_register(wdev->wiphy); if (unlikely(err < 0)) { |