Enable the channel 14 and 80 MHz width channels in the regdom

This commit is contained in:
Sergei Makarenkov 2016-12-11 09:58:50 +03:00 committed by astsam
parent 4f88d95437
commit 6813182019

View File

@ -44,34 +44,35 @@ static struct country_code_to_enum_rd allCountries[] = {
/* 5G chan 36 - chan 64 */ /* 5G chan 36 - chan 64 */
#define RTW_5GHZ_5150_5350 \ #define RTW_5GHZ_5150_5350 \
REG_RULE(5150-10, 5350+10, 40, 0, 30, \ REG_RULE(5150-10, 5350+10, 80, 0, 30, \
NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS) NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
/* 5G chan 100 - chan 165 */ /* 5G chan 100 - chan 165 */
#define RTW_5GHZ_5470_5850 \ #define RTW_5GHZ_5470_5850 \
REG_RULE(5470-10, 5850+10, 40, 0, 30, \ REG_RULE(5470-10, 5850+10, 80, 0, 30, \
NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS) NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
/* 5G chan 149 - chan 165 */ /* 5G chan 149 - chan 165 */
#define RTW_5GHZ_5725_5850 \ #define RTW_5GHZ_5725_5850 \
REG_RULE(5725-10, 5850+10, 40, 0, 30, \ REG_RULE(5725-10, 5850+10, 80, 0, 30, \
NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS) NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
/* 5G chan 36 - chan 165 */ /* 5G chan 36 - chan 165 */
#define RTW_5GHZ_5150_5850 \ #define RTW_5GHZ_5150_5850 \
REG_RULE(5150-10, 5850+10, 40, 0, 30, \ REG_RULE(5150-10, 5850+10, 80, 0, 30, \
NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS) NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
static const struct ieee80211_regdomain rtw_regdom_rd = { static const struct ieee80211_regdomain rtw_regdom_rd = {
.n_reg_rules = 3, .n_reg_rules = 4,
.alpha2 = "99", .alpha2 = "99",
.reg_rules = { .reg_rules = {
RTW_2GHZ_CH01_11, RTW_2GHZ_CH01_11,
RTW_2GHZ_CH12_13, RTW_2GHZ_CH12_13,
RTW_2GHZ_CH14,
RTW_5GHZ_5150_5850, RTW_5GHZ_5150_5850,
} }
}; };
#if 0
static const struct ieee80211_regdomain rtw_regdom_11 = { static const struct ieee80211_regdomain rtw_regdom_11 = {
.n_reg_rules = 1, .n_reg_rules = 1,
.alpha2 = "99", .alpha2 = "99",
@ -129,7 +130,7 @@ static const struct ieee80211_regdomain rtw_regdom_14 = {
RTW_2GHZ_CH14, RTW_2GHZ_CH14,
} }
}; };
#endif
#if 0 #if 0
static struct rtw_regulatory *rtw_regd; static struct rtw_regulatory *rtw_regd;
#endif #endif