Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab01e731 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 7cd66c36 3f6aa170

net/wireless/db.txt

+84 −88
Original line number Diff line number Diff line
@@ -876,18 +876,18 @@ country PT: DFS-ETSI 
	(57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR



country PR:

	(2402 - 2472 @ 40), (3, 30)

	(2402 - 2472 @ 40), (N/A, 30)

	(5170 - 5250 @ 80), (6, 24)

	(5250 - 5330 @ 80), (6, 24), DFS

	(5490 - 5730 @ 80), (6, 24), DFS

	(5735 - 5835 @ 80), (6, 30)



country PW:

	(2402 - 2472 @ 40), (3, 30)

	(5170 - 5250 @ 80), (3, 24)

	(5250 - 5330 @ 80), (3, 24), DFS

	(5490 - 5730 @ 80), (3, 24), DFS

	(5735 - 5835 @ 80), (3, 30)

	(2402 - 2472 @ 40), (N/A, 30)

	(5170 - 5250 @ 80), (6, 24)

	(5250 - 5330 @ 80), (6, 24), DFS

	(5490 - 5730 @ 80), (6, 24), DFS

	(5735 - 5835 @ 80), (6, 30)



country PY:

	(2402 - 2482 @ 40), (N/A, 20)
@@ -902,9 +902,9 @@ country QA: 


country RE:

	(2402 - 2482 @ 40), (N/A, 20)

	(5150 - 5250 @ 80), (N/A, 20)

	(5250 - 5350 @ 80), (N/A, 20), DFS

	(5470 - 5725 @ 80), (N/A, 27), DFS

	(5170 - 5250 @ 80), (N/A, 20)

	(5250 - 5330 @ 80), (N/A, 20), DFS

	(5490 - 5710 @ 80), (N/A, 27), DFS



country RO: DFS-ETSI

	(2402 - 2482 @ 40), (N/A, 20)
@@ -918,32 +918,32 @@ country RO: DFS-ETSI 
# Source:

# http://www.ratel.rs/upload/documents/Plan_namene/Plan_namene-sl_glasnik.pdf

country RS:

	(2400 - 2483.5 @ 40), (N/A, 100 mW)

	(5150 - 5250 @ 80), (N/A, 200 mW), NO-OUTDOOR

        (5250 - 5350 @ 80), (N/A, 200 mW), DFS

	(5470 - 5725 @ 80), (3, 1000 mW), DFS

	(2402 - 2482 @ 40), (N/A, 20)

	(5170 - 5250 @ 80), (N/A, 20)

        (5250 - 5330 @ 80), (N/A, 20), DFS

	(5490 - 5710 @ 80), (3, 27), DFS

	# 60 gHz band channels 1-4, ref: Etsi En 302 567

	(57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR



country RU:

	(2402 - 2482 @ 40), (N/A, 20)

	(5150 - 5250 @ 40), (N/A, 20)

	(5250 - 5350 @ 40), (N/A, 20), DFS

	(5650 - 5725 @ 40), (N/A, 30), DFS

	(5170 - 5250 @ 40), (N/A, 20)

	(5250 - 5330 @ 40), (N/A, 20), DFS

	(5650 - 5710 @ 40), (N/A, 30), DFS

	(5735 - 5835 @ 40), (N/A, 30)



country RW:

	(2402 - 2482 @ 40), (N/A, 20)

	(5150 - 5250 @ 80), (6, 24)

	(5170 - 5250 @ 80), (6, 24)

	(5250 - 5330 @ 80), (6, 24), DFS

	(5470 - 5725 @ 80), (6, 24), DFS

	(5725 - 5835 @ 80), (6, 30)

	(5490 - 5730 @ 80), (6, 24), DFS

	(5735 - 5835 @ 80), (6, 30)



country SA:

	(2402 - 2482 @ 40), (N/A, 20)

	(5170 - 5250 @ 80), (3, 20)

	(5250 - 5330 @ 80), (3, 20), DFS

	(5490 - 5710 @ 80), (3, 27), DFS

	(5170 - 5250 @ 80), (N/A, 20)

	(5250 - 5330 @ 80), (N/A, 20), DFS

	(5490 - 5710 @ 80), (N/A, 27), DFS



country SE: DFS-ETSI

	(2402 - 2482 @ 40), (N/A, 20)
@@ -978,16 +978,16 @@ country SK: DFS-ETSI 


country SN:

	(2402 - 2482 @ 40), (N/A, 20)

	(5170 - 5250 @ 80), (3, 24)

	(5250 - 5330 @ 80), (3, 24), DFS

	(5490 - 5730 @ 80), (3, 24), DFS

	(5735 - 5835 @ 80), (3, 30)

	(5170 - 5250 @ 80), (6, 24)

	(5250 - 5330 @ 80), (6, 24), DFS

	(5490 - 5730 @ 80), (6, 24), DFS

	(5735 - 5835 @ 80), (6, 30)



country SR: DFS-ETSI

	(2400 - 2483.5 @ 40), (N/A, 100 mW)

	(5150 - 5250 @ 80), (N/A, 100 mW), NO-OUTDOOR

	(5250 - 5350 @ 80), (N/A, 100 mW), NO-OUTDOOR, DFS

	(5470 - 5725 @ 80), (N/A, 500 mW), DFS

	(2402 - 2482 @ 40), (N/A, 20)

	(5170 - 5250 @ 80), (N/A, 20)

	(5250 - 5330 @ 80), (N/A, 20), DFS

	(5490 - 5710 @ 80), (N/A, 27), DFS



country SV:

	(2402 - 2482 @ 40), (N/A, 20)
@@ -1006,9 +1006,9 @@ country TC: 
	(5735 - 5835 @ 80), (6, 30)



country TW:

	(2402 - 2472 @ 40), (3, 30)

	(2402 - 2472 @ 40), (N/A, 30)

	(5270 - 5330 @ 40), (6, 17)

	(5490 - 5590 @ 80), (6, 30), DFS

	(5490 - 5590 @ 80), (6, 17), DFS

	(5650 - 5730 @ 80), (6, 30), DFS

	(5735 - 5835 @ 80), (6, 30)
@@ -1016,9 +1016,7 @@ country TD: 
	(2402 - 2482 @ 40), (N/A, 20)

	(5170 - 5250 @ 80), (N/A, 20)

	(5250 - 5330 @ 80), (N/A, 20), DFS

	(5490 - 5650 @ 80), (N/A, 27), DFS

        (5650 - 5690 @ 40), (N/A, 27), DFS

        (5690 - 5710 @ 20), (N/A, 27), DFS

	(5490 - 5710 @ 80), (N/A, 27), DFS



country TG: DFS-ETSI

	(2402 - 2482 @ 40), (N/A, 20)
@@ -1028,17 +1026,17 @@ country TG: DFS-ETSI 


country TH:

	(2402 - 2482 @ 40), (N/A, 20)

	(5170 - 5250 @ 80), (3, 24)

	(5250 - 5330 @ 80), (3, 24), DFS

	(5490 - 5730 @ 80), (3, 24), DFS

	(5735 - 5835 @ 80), (3, 30)

	(5170 - 5250 @ 80), (6, 24)

	(5250 - 5330 @ 80), (6, 24), DFS

	(5490 - 5730 @ 80), (6, 24), DFS

	(5735 - 5835 @ 80), (6, 30)



country TT:

	(2402 - 2482 @ 40), (N/A, 20)

	(5170 - 5250 @ 40), (3, 24)

	(5250 - 5330 @ 40), (3, 20), DFS

	(5490 - 5730 @ 40), (3, 20), DFS

	(5735 - 5835 @ 40), (3, 30)

	(5170 - 5250 @ 80), (6, 24)

	(5250 - 5330 @ 80), (6, 24), DFS

	(5490 - 5730 @ 80), (6, 24), DFS

	(5735 - 5835 @ 80), (6, 30)



country TN:

	(2402 - 2482 @ 40), (N/A, 20)
@@ -1065,20 +1063,20 @@ country TZ: 
# rules in the referenced laws. Such a range is used because of

# disputable definitions there.

country UA:

	(2400 - 2483.5 @ 40), (N/A, 20), NO-OUTDOOR

	(5150 - 5250 @ 40), (N/A, 20), NO-OUTDOOR

	(5250 - 5350 @ 40), (N/A, 20), NO-OUTDOOR, DFS

	(5470 - 5670 @ 40), (N/A, 20), DFS

	(5725 - 5850 @ 40), (N/A, 20)

	(2402 - 2482 @ 40), (N/A, 20)

	(5170 - 5250 @ 40), (N/A, 20)

	(5250 - 5330 @ 40), (N/A, 20), DFS

	(5490 - 5670 @ 40), (N/A, 30), DFS

	(5735 - 5835 @ 40), (N/A, 30)

	# 60 gHz band channels 1-4, ref: Etsi En 302 567

	(57240 - 65880 @ 2160), (N/A, 40), NO-OUTDOOR



country UG:

	(2402 - 2482 @ 40), (N/A, 20)

	(5150 - 5250 @ 80), (6, 24)

	(5250 - 5350 @ 80), (6, 20), DFS

        (5470 - 5725 @ 80), (6, 20), DFS

        (5725 - 5825 @ 80), (6, 20)

	(5170 - 5250 @ 80), (6, 24)

	(5250 - 5330 @ 80), (6, 24), DFS

        (5490 - 5730 @ 80), (6, 24), DFS

        (5735 - 5835 @ 80), (6, 30)



country US: DFS-FCC

	(2402 - 2472 @ 40), (N/A, 30)
@@ -1096,24 +1094,22 @@ country US: DFS-FCC 
#  db.txt cannot express the limitation on 5G so disable all 5G channels for FCC4

country PS:

	(2402 - 2472 @ 40), (N/A, 30)

	#(4940 - 4990 @ 40), (6, 27)

	#(5150 - 5250 @ 80), (6, 30)

	#(5250 - 5350 @ 80), (6, 30), DFS

	#(5725 - 5850 @ 80), (6, 33)

	(4940 - 4990 @ 40), (6, 33)

	(5170 - 5250 @ 80), (6, 17)

	(5250 - 5330 @ 80), (6, 24), DFS

	(5735 - 5835 @ 80), (6, 30)



country UY:

	(2402 - 2482 @ 40), (N/A, 20)

	(5170 - 5250 @ 40), (3, 24)

	(5250 - 5330 @ 40), (3, 20), DFS

	(5490 - 5730 @ 40), (3, 20), DFS

	(5735 - 5835 @ 40), (3, 30)

	(5170 - 5250 @ 80), (6, 24)

	(5250 - 5330 @ 80), (6, 24), DFS

	(5490 - 5730 @ 80), (6, 24), DFS

	(5735 - 5835 @ 80), (6, 30)



country UZ:

	(2402 - 2472 @ 40), (3, 27)

	(5170 - 5250 @ 40), (3, 17)

	(5250 - 5330 @ 40), (3, 20), DFS

	(5490 - 5730 @ 40), (3, 20), DFS

	(5735 - 5835 @ 40), (3, 30)

	(2402 - 2482 @ 40), (N/A, 20)

	(5170 - 5250 @ 80), (N/A, 20)

	(5250 - 5330 @ 80), (N/A, 20), DFS



country VC: DFS-ETSI

	(2402 - 2482 @ 40), (N/A, 20)
@@ -1124,30 +1120,30 @@ country VC: DFS-ETSI 


country VE:

	(2402 - 2482 @ 40), (N/A, 30)

	(5150 - 5250 @ 80), (6, 23)

        (5250 - 5350 @ 80), (6, 23), DFS

	(5170 - 5250 @ 80), (6, 23)

        (5250 - 5330 @ 80), (6, 23), DFS

	(5735 - 5835 @ 80), (6, 30)



country VN:

	(2402 - 2482 @ 40), (N/A, 20)

	(5170 - 5250 @ 80), (3, 24)

	(5250 - 5330 @ 80), (3, 24), DFS

	(5490 - 5730 @ 80), (3, 24), DFS

	(5735 - 5835 @ 80), (3, 30)

	(5170 - 5250 @ 80), (6, 24)

	(5250 - 5330 @ 80), (6, 24), DFS

	(5490 - 5730 @ 80), (6, 24), DFS

	(5735 - 5835 @ 80), (6, 30)



country VI:

	(2402 - 2472 @ 40), (N/A, 30)

	(5150 - 5250 @ 80), (6, 24)

	(5250 - 5350 @ 80), (6, 24), DFS

	(5470 - 5725 @ 80), (6, 24), DFS

	(5725 - 5850 @ 80), (6, 30)

	(5170 - 5250 @ 80), (6, 24)

	(5250 - 5330 @ 80), (6, 24), DFS

	(5490 - 5730 @ 80), (6, 24), DFS

	(5735 - 5835 @ 80), (6, 30)



country VU:

	(2402 - 2482 @ 40), (N/A, 20)

	(5170 - 5250 @ 80), (3, 24)

	(5250 - 5330 @ 80), (3, 24), DFS

	(5490 - 5730 @ 80), (3, 24), DFS

	(5735 - 5835 @ 80), (3, 30)

	(5170 - 5250 @ 80), (6, 24)

	(5250 - 5330 @ 80), (6, 24), DFS

	(5490 - 5730 @ 80), (6, 24), DFS

	(5735 - 5835 @ 80), (6, 30)



country WF: DFS-ETSI

	(2402 - 2482 @ 40), (N/A, 20)
@@ -1157,18 +1153,18 @@ country WF: DFS-ETSI 


country WS: DFS-ETSI

	(2402 - 2482 @ 40), (N/A, 20)

	(5170 - 5250 @ 20), (3, 17)

	(5250 - 5330 @ 80), (3, 24), DFS

	(5490 - 5710 @ 80), (3, 24), DFS

	(5170 - 5250 @ 40), (N/A, 20)

	(5250 - 5330 @ 40), (N/A, 20), DFS

	(5490 - 5710 @ 40), (N/A, 27), DFS



country YE:

	(2402 - 2482 @ 40), (N/A, 20)



country YT: DFS-ETSI

	(2402 - 2482 @ 40), (N/A, 20)

        (5150 - 5250 @ 80), (N/A, 20)

        (5250 - 5350 @ 80), (N/A, 20), DFS

        (5470 - 5725 @ 80), (N/A, 27), DFS

        (5170 - 5250 @ 80), (N/A, 20)

        (5250 - 5330 @ 80), (N/A, 20), DFS

        (5490 - 5710 @ 80), (N/A, 27), DFS



country ZA:

	(2402 - 2482 @ 40), (N/A, 20)
@@ -1179,7 +1175,7 @@ country ZA: 


country ZW:

	(2402 - 2482 @ 40), (N/A, 20)

	(5150 - 5250 @ 80), (N/A, 20)

	(5250 - 5350 @ 80), (N/A, 20), DFS

	(5470 - 5725 @ 80), (N/A, 27), DFS

	(5170 - 5250 @ 80), (N/A, 20)

	(5250 - 5330 @ 80), (N/A, 20), DFS

	(5490 - 5710 @ 80), (N/A, 27), DFS