diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-05-18 16:54:39 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-05-18 16:54:39 +0530 |
| commit | 342ec3b7714c672cbccaf72be8872cc555e28611 (patch) | |
| tree | fbfbf13be40f1cdbac55e3ac5d5c8cb78c67da73 | |
| parent | 04c5ca4389c75953fecc52bcfd81032edf9544df (diff) | |
| parent | f6874dc5e20d69bc5aed0d1b0edb7f9b902c8b04 (diff) | |
Merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Change-Id: Ib689952b7ac2e486761787b3eee08afa5df92683
| -rw-r--r-- | drivers/net/wireless/bcm4329/dhd_custom_gpio.c | 8 | ||||
| -rw-r--r-- | drivers/net/wireless/bcm4329/include/wlioctl.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcm4329/dhd_custom_gpio.c b/drivers/net/wireless/bcm4329/dhd_custom_gpio.c index aaca56cb7c25..42d9ec668357 100644 --- a/drivers/net/wireless/bcm4329/dhd_custom_gpio.c +++ b/drivers/net/wireless/bcm4329/dhd_custom_gpio.c @@ -183,6 +183,7 @@ dhd_custom_get_mac_address(unsigned char *buf) const struct cntry_locales_custom translate_custom_table[] = { /* Table should be filled out based on custom platform regulatory requirement */ #ifdef EXAMPLE_TABLE + {"", "XY", 4} /* universal */ {"US", "US", 69}, /* input ISO "US" to : US regrev 69 */ {"CA", "US", 69}, /* input ISO "CA" to : US regrev 69 */ {"EU", "EU", 5}, /* input ISO "EU" to : EU regrev 05 */ @@ -193,7 +194,10 @@ const struct cntry_locales_custom translate_custom_table[] = { {"KR", "XY", 3}, {"AU", "XY", 3}, {"CN", "XY", 3}, /* input ISO "CN" to : XY regrev 03 */ + {"HK", "XY", 3}, {"TW", "XY", 3}, + {"BR", "XY", 3}, + {"MX", "XY", 3}, {"AR", "XY", 3} #endif /* EXAMPLE_TABLE */ }; @@ -232,9 +236,11 @@ void get_customized_country_code(char *country_iso_code, wl_country_t *cspec) if (strcmp(country_iso_code, translate_custom_table[i].iso_abbrev) == 0) { memcpy(cspec->ccode, translate_custom_table[i].custom_locale, WLC_CNTRY_BUF_SZ); cspec->rev = translate_custom_table[i].custom_locale_rev; - break; + return; } } + memcpy(cspec->ccode, translate_custom_table[0].custom_locale, WLC_CNTRY_BUF_SZ); + cspec->rev = translate_custom_table[0].custom_locale_rev; return; #endif } diff --git a/drivers/net/wireless/bcm4329/include/wlioctl.h b/drivers/net/wireless/bcm4329/include/wlioctl.h index 94518205d3d8..00c61f10782f 100644 --- a/drivers/net/wireless/bcm4329/include/wlioctl.h +++ b/drivers/net/wireless/bcm4329/include/wlioctl.h @@ -862,7 +862,7 @@ typedef struct wl_ioctl { #define PM_MAX 1 #define PM_FAST 2 -#define LISTEN_INTERVAL 20 +#define LISTEN_INTERVAL 10 #define INTERFERE_NONE 0 #define NON_WLAN 1 |