Merge "msm: wlan: update regulatory database" into msm-4.4

This commit is contained in:
Service qcabuildsw 2016-11-18 15:41:21 -08:00 committed by Gerrit - the friendly Code Review server
commit 42939d0685

View file

@ -16,7 +16,7 @@ country 00:
(57240 - 63720 @ 2160), (0) (57240 - 63720 @ 2160), (0)
country AE: DFS-FCC country AE: DFS-ETSI
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (24), AUTO-BW (5170 - 5250 @ 80), (24), AUTO-BW
(5250 - 5330 @ 80), (24), DFS, AUTO-BW (5250 - 5330 @ 80), (24), DFS, AUTO-BW
@ -52,13 +52,12 @@ country AN: DFS-ETSI
(5250 - 5330 @ 80), (23), DFS, AUTO-BW (5250 - 5330 @ 80), (23), DFS, AUTO-BW
(5490 - 5710 @ 160), (30), DFS (5490 - 5710 @ 160), (30), DFS
country AR: DFS-FCC country AR:
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (36)
(5170 - 5250 @ 80), (24), AUTO-BW (5170 - 5330 @ 160), (23)
(5250 - 5330 @ 80), (24), DFS, AUTO-BW (5490 - 5590 @ 80), (36)
(5490 - 5590 @ 80), (24), DFS (5650 - 5730 @ 80), (36)
(5650 - 5730 @ 80), (24), DFS (5735 - 5835 @ 80), (36)
(5735 - 5835 @ 80), (30)
country AS: DFS-FCC country AS: DFS-FCC
(2402 - 2472 @ 40), (30) (2402 - 2472 @ 40), (30)
@ -162,11 +161,10 @@ country BG: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567 # 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country BH: DFS-ETSI country BH:
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (20) (5170 - 5330 @ 20), (23)
(5250 - 5330 @ 20), (20), DFS (5735 - 5835 @ 20), (33)
(5735 - 5835 @ 20), (20)
country BL: DFS-ETSI country BL: DFS-ETSI
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
@ -219,8 +217,10 @@ country BY: DFS-ETSI
(5490 - 5710 @ 160), (30), DFS (5490 - 5710 @ 160), (30), DFS
country BZ: country BZ:
(2402 - 2482 @ 40), (30) (2402 - 2482 @ 40), (36)
(5735 - 5835 @ 80), (30) (5170 - 5330 @ 160), (27)
(5490 - 5730 @ 160), (36)
(5735 - 5835 @ 80), (36)
country CA: DFS-FCC country CA: DFS-FCC
(2402 - 2472 @ 40), (30) (2402 - 2472 @ 40), (30)
@ -259,10 +259,9 @@ country CI: DFS-FCC
(5490 - 5730 @ 160), (24), DFS (5490 - 5730 @ 160), (24), DFS
(5735 - 5835 @ 80), (30) (5735 - 5835 @ 80), (30)
country CL: DFS-ETSI country CL:
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20), AUTO-BW (5170 - 5330 @ 160), (20)
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5735 - 5835 @ 80), (20) (5735 - 5835 @ 80), (20)
country CN: DFS-FCC country CN: DFS-FCC
@ -416,9 +415,9 @@ country EE: DFS-ETSI
(57240 - 65880 @ 2160), (40), NO-OUTDOOR (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country EG: DFS-ETSI country EG: DFS-ETSI
(2402 - 2482 @ 20), (20) (2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (23) (5170 - 5250 @ 40), (23)
(5250 - 5330 @ 20), (23), DFS (5250 - 5330 @ 40), (23), DFS
country ES: DFS-ETSI country ES: DFS-ETSI
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
@ -581,11 +580,10 @@ country HK: DFS-FCC
(5490 - 5730 @ 160), (24), DFS (5490 - 5730 @ 160), (24), DFS
(5735 - 5835 @ 80), (30) (5735 - 5835 @ 80), (30)
country HN: DFS-FCC country HN:
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (24), AUTO-BW (5170 - 5330 @ 160), (24)
(5250 - 5330 @ 80), (24), DFS, AUTO-BW (5490 - 5730 @ 160), (24)
(5490 - 5730 @ 160), (24), DFS
(5735 - 5835 @ 80), (30) (5735 - 5835 @ 80), (30)
country HR: DFS-ETSI country HR: DFS-ETSI
@ -657,10 +655,9 @@ country IL: DFS-ETSI
(5170 - 5250 @ 80), (23), AUTO-BW (5170 - 5250 @ 80), (23), AUTO-BW
(5250 - 5330 @ 80), (23), DFS, AUTO-BW (5250 - 5330 @ 80), (23), DFS, AUTO-BW
country IN: DFS-ETSI country IN:
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (23), AUTO-BW (5170 - 5330 @ 160), (23)
(5250 - 5330 @ 80), (23), DFS, AUTO-BW
(5735 - 5835 @ 80), (30) (5735 - 5835 @ 80), (30)
country IR: country IR:
@ -735,7 +732,7 @@ country KH: DFS-ETSI
(5250 - 5330 @ 80), (23), DFS, AUTO-BW (5250 - 5330 @ 80), (23), DFS, AUTO-BW
(5490 - 5710 @ 160), (30), DFS (5490 - 5710 @ 160), (30), DFS
country KN: DFS-ETSI country KN: DFS-FCC
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (23), AUTO-BW (5170 - 5250 @ 80), (23), AUTO-BW
(5250 - 5330 @ 80), (23), DFS, AUTO-BW (5250 - 5330 @ 80), (23), DFS, AUTO-BW
@ -746,8 +743,8 @@ country KR: DFS-ETSI
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20), AUTO-BW (5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW (5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5630 @ 80), (30), DFS (5490 - 5710 @ 80), (30), DFS
(5735 - 5815 @ 80), (30) (5735 - 5835 @ 80), (30)
# 60 GHz band channels 1-4, # 60 GHz band channels 1-4,
# ref: http://www.law.go.kr/%ED%96%89%EC%A0%95%EA%B7%9C%EC%B9%99/%EB%AC%B4%EC%84%A0%EC%84%A4%EB%B9%84%EA%B7%9C%EC%B9%99 # ref: http://www.law.go.kr/%ED%96%89%EC%A0%95%EA%B7%9C%EC%B9%99/%EB%AC%B4%EC%84%A0%EC%84%A4%EB%B9%84%EA%B7%9C%EC%B9%99
(57000 - 66000 @ 2160), (43) (57000 - 66000 @ 2160), (43)
@ -781,7 +778,7 @@ country LB: DFS-FCC
(5490 - 5730 @ 160), (24), DFS (5490 - 5730 @ 160), (24), DFS
(5735 - 5835 @ 80), (30) (5735 - 5835 @ 80), (30)
country LC: DFS-ETSI country LC: DFS-FCC
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20), AUTO-BW (5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (30), DFS, AUTO-BW (5250 - 5330 @ 80), (30), DFS, AUTO-BW
@ -1047,10 +1044,9 @@ country NO: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567 # 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country NP: DFS-ETSI country NP:
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20), AUTO-BW (5170 - 5330 @ 160), (20)
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5735 - 5835 @ 80), (20) (5735 - 5835 @ 80), (20)
country NZ: DFS-FCC country NZ: DFS-FCC
@ -1066,11 +1062,11 @@ country OM: DFS-ETSI
(5250 - 5330 @ 80), (23), DFS, AUTO-BW (5250 - 5330 @ 80), (23), DFS, AUTO-BW
(5490 - 5710 @ 160), (30), DFS (5490 - 5710 @ 160), (30), DFS
country PA: DFS-FCC country PA:
(2402 - 2472 @ 40), (30) (2402 - 2472 @ 40), (30)
(5170 - 5250 @ 80), (23), AUTO-BW (5170 - 5250 @ 80), (23), AUT0-BW
(5250 - 5330 @ 80), (23), DFS, AUTO-BW (5250 - 5330 @ 80), (30), AUTO-BW
(5735 - 5835 @ 80), (30) (5735 - 5835 @ 80), (36)
country PE: DFS-FCC country PE: DFS-FCC
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
@ -1208,11 +1204,10 @@ country RS: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567 # 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country RU: DFS-ETSI country RU:
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (23), AUTO-BW (5170 - 5330 @ 160), (23)
(5250 - 5330 @ 80), (23), DFS, AUTO-BW (5490 - 5730 @ 160), (30)
(5490 - 5730 @ 160), (30), DFS
(5735 - 5835 @ 80), (30) (5735 - 5835 @ 80), (30)
country RW: DFS-FCC country RW: DFS-FCC
@ -1286,11 +1281,10 @@ country SK: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567 # 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country SN: DFS-FCC country SN:
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (24), AUTO-BW (5170 - 5330 @ 160), (24)
(5250 - 5330 @ 80), (24), DFS, AUTO-BW (5490 - 5730 @ 160), (24)
(5490 - 5730 @ 160), (24), DFS
(5735 - 5835 @ 80), (30) (5735 - 5835 @ 80), (30)
country SR: DFS-ETSI country SR: DFS-ETSI
@ -1347,12 +1341,11 @@ country TR: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567 # 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR (57240 - 65880 @ 2160), (40), NO-OUTDOOR
country TT: DFS-FCC country TT:
(2402 - 2482 @ 40), (20) (2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (24), AUTO-BW (5170 - 5330 @ 160), (27)
(5250 - 5330 @ 80), (24), DFS, AUTO-BW (5490 - 5730 @ 160), (36)
(5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (36)
(5735 - 5835 @ 80), (30)
country TW: DFS-FCC country TW: DFS-FCC
(2402 - 2472 @ 40), (30) (2402 - 2472 @ 40), (30)