UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtl8188eu: use table to get channel plan from country code 

Use a table to get a channel plan from a given country code.This was a
TODO mentioned as a comment in the driver.

Signed-off-by: Hari Prasath Gujulan Elango <hgujulan@visteon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hari Prasath Gujulan Elango 2015-06-01 12:43:01 +00:00 committed by Greg Kroah-Hartman
parent 6ed977428a
commit ed701c4ab2
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c
View File

@ -642,21 +642,18 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)
*/
int rtw_set_country(struct adapter *adapter, const char *country_code)
{
int i;
int channel_plan = RT_CHANNEL_DOMAIN_WORLD_WIDE_5G;
DBG_88E("%s country_code:%s\n", __func__, country_code);
for (i = 0; i < ARRAY_SIZE(channel_table); i++) {
if (0 == strcmp(channel_table[i].name, country_code)) {
channel_plan = channel_table[i].channel_plan;
break;
}
}
/* TODO: should have a table to match country code and RT_CHANNEL_DOMAIN */
/* TODO: should consider 2-character and 3-character country code */
if (0 == strcmp(country_code, "US"))
channel_plan = RT_CHANNEL_DOMAIN_FCC;
else if (0 == strcmp(country_code, "EU"))
channel_plan = RT_CHANNEL_DOMAIN_ETSI;
else if (0 == strcmp(country_code, "JP"))
channel_plan = RT_CHANNEL_DOMAIN_MKK;
else if (0 == strcmp(country_code, "CN"))
channel_plan = RT_CHANNEL_DOMAIN_CHINA;
else
if (i == ARRAY_SIZE(channel_table))
DBG_88E("%s unknown country_code:%s\n", __func__, country_code);
return rtw_set_chplan_cmd(adapter, channel_plan, 1);

8
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
View File

@ -191,6 +191,14 @@ struct rt_channel_plan_map {
unsigned char Index2G;
};
static const struct {
int channel_plan;
char *name;
} channel_table[] = { { RT_CHANNEL_DOMAIN_FCC, "US" },
{ RT_CHANNEL_DOMAIN_ETSI, "EU" },
{ RT_CHANNEL_DOMAIN_MKK, "JP" },
{ RT_CHANNEL_DOMAIN_CHINA, "CN"} };
enum Associated_AP {
atherosAP = 0,
broadcomAP = 1,