Merge "msm: wlan: Correct db.txt entries"

This commit is contained in:
Linux Build Service Account 2014-10-26 04:37:40 -07:00 committed by Gerrit - the friendly Code Review server
commit 338a65962d

View file

@ -582,7 +582,7 @@ country KY:
(5735 - 5835 @ 80), (3, 30)
country KR:
(2402 - 2482 @ 20), (N/A, 20)
(2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 80), (6, 20)
(5250 - 5330 @ 80), (6, 20), DFS
(5490 - 5710 @ 80), (6, 30), DFS
@ -604,7 +604,7 @@ country LB:
(5735 - 5835 @ 80), (6, 30)
country LC:
(2402 - 2482 @ 20), (N/A, 20)
(2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 80), (6, 20)
(5250 - 5330 @ 80), (6, 20), DFS
(5490 - 5710 @ 80), (6, 30), DFS
@ -618,10 +618,10 @@ country LI: DFS-ETSI
country LK:
(2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 20), (3, 24)
(5250 - 5330 @ 20), (3, 20), DFS
(5490 - 5730 @ 20), (3, 20), DFS
(5735 - 5835 @ 20), (3, 30)
(5170 - 5250 @ 20), (6, 24)
(5250 - 5330 @ 20), (6, 24), DFS
(5490 - 5730 @ 20), (6, 24), DFS
(5735 - 5835 @ 20), (6, 30)
country LS: DFS-ETSI
(2402 - 2482 @ 40), (N/A, 20)
@ -662,7 +662,7 @@ country MC: DFS-ETSI
country MA:
(2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 80), (N/A, 20)
(5735 - 5835 @ 80), (N/A, 20), DFS
(5250 - 5330 @ 80), (N/A, 20), DFS
country MD: DFS-ETSI
(2402 - 2482 @ 40), (N/A, 20)
@ -691,9 +691,7 @@ country MH: DFS-FCC
country MO:
(2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 40), (3, 23)
(5250 - 5330 @ 40), (3, 23), DFS
(5735 - 5835 @ 40), (3, 30)
(5735 - 5835 @ 80), (N/A, 30)
country MP:
(2402 - 2472 @ 40), (N/A, 30)
@ -704,9 +702,9 @@ country MP:
country MK: DFS-ETSI
(2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 40), (N/A, 20)
(5250 - 5330 @ 40), (N/A, 20), DFS
(5490 - 5710 @ 40), (N/A, 27), DFS
(5170 - 5250 @ 80), (N/A, 20)
(5250 - 5330 @ 80), (N/A, 20), DFS
(5490 - 5710 @ 80), (N/A, 27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
@ -719,9 +717,9 @@ country MN:
country MT: DFS-ETSI
(2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 40), (N/A, 20)
(5250 - 5330 @ 40), (N/A, 20), DFS
(5490 - 5710 @ 40), (N/A, 27), DFS
(5170 - 5250 @ 80), (N/A, 20)
(5250 - 5330 @ 80), (N/A, 20), DFS
(5490 - 5710 @ 80), (N/A, 27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
@ -752,16 +750,16 @@ country MR: DFS-ETSI
country MY:
(2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 80), (N/A, 17)
(5250 - 5330 @ 80), (N/A, 23), DFS
(5735 - 5835 @ 80), (N/A, 30)
(5170 - 5250 @ 80), (6, 17)
(5250 - 5330 @ 80), (6, 23), DFS
(5735 - 5835 @ 80), (6, 30)
country MX:
(2402 - 2482 @ 40), (3, 20)
(5170 - 5250 @ 80), (3, 24)
(5250 - 5330 @ 80), (3, 24), DFS
(5490 - 5730 @ 80), (3, 24), DFS
(5735 - 5835 @ 80), (3, 30)
(2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 80), (6, 24)
(5250 - 5330 @ 80), (6, 24), DFS
(5490 - 5730 @ 80), (6, 24), DFS
(5735 - 5835 @ 80), (6, 30)
country MW:
(2402 - 2482 @ 40), (N/A, 20)
@ -771,8 +769,8 @@ country MW:
country NG:
(2402 - 2482 @ 40), (N/A, 20)
(5250 - 5350 @ 80), (N/A, 30), DFS
(5725 - 5850 @ 80), (N/A, 30)
(5250 - 5330 @ 80), (N/A, 30), DFS
(5735 - 5835 @ 80), (N/A, 30)
country NI:
(2402 - 2472 @ 40), (N/A, 30)
@ -783,8 +781,8 @@ country NI:
country NL: DFS-ETSI
(2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 80), (N/A, 20), NO-OUTDOOR
(5250 - 5330 @ 80), (N/A, 20), NO-OUTDOOR, DFS
(5170 - 5250 @ 80), (N/A, 20)
(5250 - 5330 @ 80), (N/A, 20), DFS
(5490 - 5710 @ 80), (N/A, 27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR
@ -799,9 +797,9 @@ country NO: DFS-ETSI
country NP:
(2402 - 2482 @ 40), (N/A, 20)
(5150 - 5250 @ 80), (N/A, 20)
(5250 - 5350 @ 80), (N/A, 20), DFS
(5725 - 5850 @ 80), (N/A, 20)
(5170 - 5250 @ 80), (N/A, 20)
(5250 - 5330 @ 80), (N/A, 20), DFS
(5735 - 5835 @ 80), (N/A, 20)
country NZ:
(2402 - 2482 @ 40), (N/A, 30)
@ -825,8 +823,8 @@ country PA:
country PE:
(2402 - 2482 @ 40), (N/A, 20)
(5170 - 5250 @ 80), (6, 24)
(5250 - 5330 @ 80), (6, 20), DFS
(5490 - 5730 @ 80), (6, 27), DFS
(5250 - 5330 @ 80), (6, 24), DFS
(5490 - 5730 @ 80), (6, 24), DFS
(5735 - 5835 @ 80), (6, 30)
country PF: