Skip to content

Commit 02f697a

Browse files
Zong-Zhe YangKalle Valo
authored andcommitted
wifi: rtw88: regd: update regulatory map to R64-R42
Sync Realtek Regulatory R42 and Realtek Channel Plan R64. Start to configure with Realtek regd CHILE, CN, UK, QATAR, UKRAINE. Signed-off-by: Zong-Zhe Yang <[email protected]> Signed-off-by: Ping-Ke Shih <[email protected]> Signed-off-by: Kalle Valo <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 9c2651f commit 02f697a

File tree

1 file changed

+7
-7
lines changed
  • drivers/net/wireless/realtek/rtw88

1 file changed

+7
-7
lines changed

drivers/net/wireless/realtek/rtw88/regd.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@ static const struct rtw_regulatory rtw_reg_map[] = {
7070
COUNTRY_REGD_ENT("BY", RTW_REGD_ETSI, RTW_REGD_ETSI),
7171
COUNTRY_REGD_ENT("BZ", RTW_REGD_FCC, RTW_REGD_FCC),
7272
COUNTRY_REGD_ENT("CA", RTW_REGD_IC, RTW_REGD_IC),
73-
COUNTRY_REGD_ENT("CC", RTW_REGD_ETSI, RTW_REGD_ETSI),
73+
COUNTRY_REGD_ENT("CC", RTW_REGD_ACMA, RTW_REGD_ACMA),
7474
COUNTRY_REGD_ENT("CD", RTW_REGD_ETSI, RTW_REGD_ETSI),
7575
COUNTRY_REGD_ENT("CF", RTW_REGD_ETSI, RTW_REGD_ETSI),
7676
COUNTRY_REGD_ENT("CG", RTW_REGD_ETSI, RTW_REGD_ETSI),
7777
COUNTRY_REGD_ENT("CH", RTW_REGD_ETSI, RTW_REGD_ETSI),
7878
COUNTRY_REGD_ENT("CI", RTW_REGD_ETSI, RTW_REGD_ETSI),
7979
COUNTRY_REGD_ENT("CK", RTW_REGD_ETSI, RTW_REGD_ETSI),
80-
COUNTRY_REGD_ENT("CL", RTW_REGD_FCC, RTW_REGD_FCC),
80+
COUNTRY_REGD_ENT("CL", RTW_REGD_CHILE, RTW_REGD_CHILE),
8181
COUNTRY_REGD_ENT("CM", RTW_REGD_ETSI, RTW_REGD_ETSI),
82-
COUNTRY_REGD_ENT("CN", RTW_REGD_ETSI, RTW_REGD_ETSI),
82+
COUNTRY_REGD_ENT("CN", RTW_REGD_CN, RTW_REGD_CN),
8383
COUNTRY_REGD_ENT("CO", RTW_REGD_FCC, RTW_REGD_FCC),
8484
COUNTRY_REGD_ENT("CR", RTW_REGD_FCC, RTW_REGD_FCC),
8585
COUNTRY_REGD_ENT("CV", RTW_REGD_ETSI, RTW_REGD_ETSI),
@@ -106,7 +106,7 @@ static const struct rtw_regulatory rtw_reg_map[] = {
106106
COUNTRY_REGD_ENT("FO", RTW_REGD_ETSI, RTW_REGD_ETSI),
107107
COUNTRY_REGD_ENT("FR", RTW_REGD_ETSI, RTW_REGD_ETSI),
108108
COUNTRY_REGD_ENT("GA", RTW_REGD_ETSI, RTW_REGD_ETSI),
109-
COUNTRY_REGD_ENT("GB", RTW_REGD_ETSI, RTW_REGD_ETSI),
109+
COUNTRY_REGD_ENT("GB", RTW_REGD_UK, RTW_REGD_UK),
110110
COUNTRY_REGD_ENT("GD", RTW_REGD_FCC, RTW_REGD_FCC),
111111
COUNTRY_REGD_ENT("GE", RTW_REGD_ETSI, RTW_REGD_ETSI),
112112
COUNTRY_REGD_ENT("GF", RTW_REGD_ETSI, RTW_REGD_ETSI),
@@ -214,7 +214,7 @@ static const struct rtw_regulatory rtw_reg_map[] = {
214214
COUNTRY_REGD_ENT("PT", RTW_REGD_ETSI, RTW_REGD_ETSI),
215215
COUNTRY_REGD_ENT("PW", RTW_REGD_FCC, RTW_REGD_FCC),
216216
COUNTRY_REGD_ENT("PY", RTW_REGD_FCC, RTW_REGD_FCC),
217-
COUNTRY_REGD_ENT("QA", RTW_REGD_ETSI, RTW_REGD_ETSI),
217+
COUNTRY_REGD_ENT("QA", RTW_REGD_QATAR, RTW_REGD_QATAR),
218218
COUNTRY_REGD_ENT("RE", RTW_REGD_ETSI, RTW_REGD_ETSI),
219219
COUNTRY_REGD_ENT("RO", RTW_REGD_ETSI, RTW_REGD_ETSI),
220220
COUNTRY_REGD_ENT("RS", RTW_REGD_ETSI, RTW_REGD_ETSI),
@@ -234,7 +234,7 @@ static const struct rtw_regulatory rtw_reg_map[] = {
234234
COUNTRY_REGD_ENT("SN", RTW_REGD_ETSI, RTW_REGD_ETSI),
235235
COUNTRY_REGD_ENT("SO", RTW_REGD_ETSI, RTW_REGD_ETSI),
236236
COUNTRY_REGD_ENT("SR", RTW_REGD_FCC, RTW_REGD_FCC),
237-
COUNTRY_REGD_ENT("ST", RTW_REGD_FCC, RTW_REGD_FCC),
237+
COUNTRY_REGD_ENT("ST", RTW_REGD_ETSI, RTW_REGD_ETSI),
238238
COUNTRY_REGD_ENT("SV", RTW_REGD_FCC, RTW_REGD_FCC),
239239
COUNTRY_REGD_ENT("SX", RTW_REGD_FCC, RTW_REGD_FCC),
240240
COUNTRY_REGD_ENT("SZ", RTW_REGD_ETSI, RTW_REGD_ETSI),
@@ -253,7 +253,7 @@ static const struct rtw_regulatory rtw_reg_map[] = {
253253
COUNTRY_REGD_ENT("TV", RTW_REGD_ETSI, RTW_REGD_WW),
254254
COUNTRY_REGD_ENT("TW", RTW_REGD_FCC, RTW_REGD_FCC),
255255
COUNTRY_REGD_ENT("TZ", RTW_REGD_ETSI, RTW_REGD_ETSI),
256-
COUNTRY_REGD_ENT("UA", RTW_REGD_ETSI, RTW_REGD_ETSI),
256+
COUNTRY_REGD_ENT("UA", RTW_REGD_UKRAINE, RTW_REGD_UKRAINE),
257257
COUNTRY_REGD_ENT("UG", RTW_REGD_ETSI, RTW_REGD_ETSI),
258258
COUNTRY_REGD_ENT("US", RTW_REGD_FCC, RTW_REGD_FCC),
259259
COUNTRY_REGD_ENT("UY", RTW_REGD_FCC, RTW_REGD_FCC),

0 commit comments

Comments
 (0)