net: wireless: bcm4329: Use non-DFS channels only for US

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

diff --git a/drivers/net/wireless/bcm4329/Makefile b/drivers/net/wireless/bcm4329/Makefile
index 3f49a643e8ff35ad87746546c1fa19566b33b839..f808fb21256b0d81d543c26ca62fec445d313e89 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                                                          \
+       -DKEEP_ALIVE -DCONFIG_US_NON_DFS_CHANNELS_ONLY                        \
        -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 4f7fc8b7b556bd3de2cf1782cabb02b7820445c0..3e3b09f048e963554ce6b6509d282a6afd6f8455 100644 (file)
--- a/drivers/net/wireless/bcm4329/wl_iw.c
+++ b/drivers/net/wireless/bcm4329/wl_iw.c
@@ -632,11 +632,13 @@ wl_iw_set_country(
        country_offset = strcspn(extra, " ");
        country_code_size = strlen(extra) - country_offset;
 
-       
        if (country_offset != 0) {
                strncpy(country_code, extra + country_offset + 1,
                        MIN(country_code_size, sizeof(country_code)));
-
+#ifdef CONFIG_US_NON_DFS_CHANNELS_ONLY
+               if (!strncmp(country_code, "US", 2))
+                       strncpy(country_code, "Q2", WLC_CNTRY_BUF_SZ);
+#endif
                if ((error = dev_wlc_ioctl(dev, WLC_SET_COUNTRY,
                        &country_code, sizeof(country_code))) >= 0) {
                        p += snprintf(p, MAX_WX_STRING, "OK");