net: wireless: bcm4329: Turn off CONFIG_US_NON_DFS_CHANNELS_ONLY

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

diff --git a/drivers/net/wireless/bcm4329/Makefile b/drivers/net/wireless/bcm4329/Makefile
index f808fb21256b0d81d543c26ca62fec445d313e89..3f49a643e8ff35ad87746546c1fa19566b33b839 100644 (file)
--- a/drivers/net/wireless/bcm4329/Makefile
+++ b/drivers/net/wireless/bcm4329/Makefile
@@ -7,7 +7,7 @@ DHDCFLAGS = -DLINUX -DBCMDRIVER -DBCMDONGLEHOST -DDHDTHREAD -DBCMWPA2         \
        -DDHD_USE_STATIC_BUF -DMMC_SDIO_ABORT -DDHD_DEBUG_TRAP -DSOFTAP       \
        -DEMBEDDED_PLATFORM -DARP_OFFLOAD_SUPPORT -DPKT_FILTER_SUPPORT        \
        -DGET_CUSTOM_MAC_ENABLE -DSET_RANDOM_MAC_SOFTAP -DCSCAN -DHW_OOB      \
-       -DKEEP_ALIVE -DCONFIG_US_NON_DFS_CHANNELS_ONLY                        \
+       -DKEEP_ALIVE                                                          \
        -Idrivers/net/wireless/bcm4329 -Idrivers/net/wireless/bcm4329/include
 
 DHDOFILES = dhd_linux.o linux_osl.o bcmutils.o dhd_common.o dhd_custom_gpio.o \

diff --git a/drivers/net/wireless/bcm4329/wl_iw.c b/drivers/net/wireless/bcm4329/wl_iw.c
index bfa0fa7ac77debb11833e013d9fb8e88f062aa9e..8460804c945ad46b346ef981a895c1cf52bc9440 100644 (file)
--- a/drivers/net/wireless/bcm4329/wl_iw.c
+++ b/drivers/net/wireless/bcm4329/wl_iw.c
@@ -632,8 +632,8 @@ wl_iw_set_country_code(struct net_device *dev, char *ccode)
        if (ccode && (country_code[0] != 0)) {
 #ifdef CONFIG_US_NON_DFS_CHANNELS_ONLY
                if (use_non_dfs_channels && !strncmp(country_code, "US", 2))
-                       strncpy(country_code, "US/69", WLC_CNTRY_BUF_SZ);
-               if (!use_non_dfs_channels && !strncmp(country_code, "US/69", 2))
+                       strncpy(country_code, "Q2", WLC_CNTRY_BUF_SZ);
+               if (!use_non_dfs_channels && !strncmp(country_code, "Q2", 2))
                        strncpy(country_code, "US", WLC_CNTRY_BUF_SZ);
 #endif
                ret = dev_wlc_ioctl(dev, WLC_SET_COUNTRY, &country_code, sizeof(country_code));