korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-29 14:05:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

rtlwifi: Update regulatory database

Browse Source 
Driver rtlwifi maintains its own regulatory information, The Chrome Autotest
(https://www.chromium.org/chromium-os/testing/autotest-user-doc)
showed some errors. This patch adds the necessary information for rtlwifi.

Signed-off-by: Shao Fu <shaofu@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Shao Fu 2015-05-15 16:32:59 -05:00 committed by Kalle Valo
parent e3958e9d60
commit 02b5fffbe9
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/net/wireless/rtlwifi/regd.c
View File

@ -40,6 +40,7 @@ static struct country_code_to_enum_rd allCountries[] = {
{COUNTRY_CODE_GLOBAL_DOMAIN, "JP"}, {COUNTRY_CODE_GLOBAL_DOMAIN, "JP"},
{COUNTRY_CODE_WORLD_WIDE_13, "EC"}, {COUNTRY_CODE_WORLD_WIDE_13, "EC"},
{COUNTRY_CODE_TELEC_NETGEAR, "EC"}, {COUNTRY_CODE_TELEC_NETGEAR, "EC"},
{COUNTRY_CODE_WORLD_WIDE_13_5G_ALL, "US"},
}; };
/* /*
@ -124,6 +125,17 @@ static const struct ieee80211_regdomain rtl_regdom_14_60_64 = {
} }
}; };
static const struct ieee80211_regdomain rtl_regdom_12_13_5g_all = {
.n_reg_rules = 4,
.alpha2 = "99",
.reg_rules = {
RTL819x_2GHZ_CH01_11,
RTL819x_2GHZ_CH12_13,
RTL819x_5GHZ_5150_5350,
RTL819x_5GHZ_5470_5850,
}
};
static const struct ieee80211_regdomain rtl_regdom_14 = { static const struct ieee80211_regdomain rtl_regdom_14 = {
.n_reg_rules = 3, .n_reg_rules = 3,
.alpha2 = "99", .alpha2 = "99",
@ -348,6 +360,8 @@ static const struct ieee80211_regdomain *_rtl_regdomain_select(
return &rtl_regdom_14_60_64; return &rtl_regdom_14_60_64;
case COUNTRY_CODE_GLOBAL_DOMAIN: case COUNTRY_CODE_GLOBAL_DOMAIN:
return &rtl_regdom_14; return &rtl_regdom_14;
case COUNTRY_CODE_WORLD_WIDE_13_5G_ALL:
return &rtl_regdom_12_13_5g_all;
default: default:
return &rtl_regdom_no_midband; return &rtl_regdom_no_midband;
} }
@ -384,6 +398,25 @@ static struct country_code_to_enum_rd *_rtl_regd_find_country(u16 countrycode)
return NULL; return NULL;
} }
static u8 channel_plan_to_country_code(u8 channelplan)
{
switch (channelplan) {
case 0x20:
case 0x21:
return COUNTRY_CODE_WORLD_WIDE_13;
case 0x22:
return COUNTRY_CODE_IC;
case 0x32:
return COUNTRY_CODE_TELEC_NETGEAR;
case 0x41:
return COUNTRY_CODE_GLOBAL_DOMAIN;
case 0x7f:
return COUNTRY_CODE_WORLD_WIDE_13_5G_ALL;
default:
return COUNTRY_CODE_MAX; /*Error*/
}
}
int rtl_regd_init(struct ieee80211_hw *hw, int rtl_regd_init(struct ieee80211_hw *hw,
void (*reg_notifier)(struct wiphy *wiphy, void (*reg_notifier)(struct wiphy *wiphy,
struct regulatory_request *request)) struct regulatory_request *request))
@ -396,11 +429,12 @@ int rtl_regd_init(struct ieee80211_hw *hw,
return -EINVAL; return -EINVAL;
/* init country_code from efuse channel plan */ /* init country_code from efuse channel plan */
rtlpriv->regd.country_code = rtlpriv->efuse.channel_plan; rtlpriv->regd.country_code =
channel_plan_to_country_code(rtlpriv->efuse.channel_plan);
RT_TRACE(rtlpriv, COMP_REGD, DBG_TRACE, RT_TRACE(rtlpriv, COMP_REGD, DBG_DMESG,
"rtl: EEPROM regdomain: 0x%0x\n", "rtl: EEPROM regdomain: 0x%0x conuntry code: %d\n",
rtlpriv->regd.country_code); rtlpriv->efuse.channel_plan, rtlpriv->regd.country_code);
if (rtlpriv->regd.country_code >= COUNTRY_CODE_MAX) { if (rtlpriv->regd.country_code >= COUNTRY_CODE_MAX) {
RT_TRACE(rtlpriv, COMP_REGD, DBG_DMESG, RT_TRACE(rtlpriv, COMP_REGD, DBG_DMESG,

1
drivers/net/wireless/rtlwifi/regd.h
View File

@ -49,6 +49,7 @@ enum country_code_type_t {
COUNTRY_CODE_GLOBAL_DOMAIN = 10, COUNTRY_CODE_GLOBAL_DOMAIN = 10,
COUNTRY_CODE_WORLD_WIDE_13 = 11, COUNTRY_CODE_WORLD_WIDE_13 = 11,
COUNTRY_CODE_TELEC_NETGEAR = 12, COUNTRY_CODE_TELEC_NETGEAR = 12,
COUNTRY_CODE_WORLD_WIDE_13_5G_ALL = 13,
/*add new channel plan above this line */ /*add new channel plan above this line */
COUNTRY_CODE_MAX COUNTRY_CODE_MAX