From patchwork Thu Nov 13 09:18:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jouni Malinen X-Patchwork-Id: 5294521 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5E7B3C11AC for ; Thu, 13 Nov 2014 09:19:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 406002013D for ; Thu, 13 Nov 2014 09:19:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BCD220136 for ; Thu, 13 Nov 2014 09:19:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932107AbaKMJTS (ORCPT ); Thu, 13 Nov 2014 04:19:18 -0500 Received: from sabertooth01.qualcomm.com ([65.197.215.72]:19632 "EHLO sabertooth01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753629AbaKMJTQ (ORCPT ); Thu, 13 Nov 2014 04:19:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1415870355; x=1447406355; h=from:to:cc:subject:date:message-id:mime-version; bh=kX1k2EYSzeoXq7F1/M2T1S/XDtYNMjun946SSCrPFOM=; b=cOEUnPK0Tn6O6Kpzc7Jy40aOpdTIrw6KTGkufZz1sfJCDebqEE9MviNW IeEt8bmvbV0hyF/C3QIQInCJPOKDZyPDyo2K0IINoFKiuxLVzuOs1k3+5 FNHbNUp9IoFEHyfHPcfCjpJI+UgHNxsgquSp+mzLVJvIrpiQkwFkDuPj5 o=; X-IronPort-AV: E=McAfee;i="5600,1067,7620"; a="78100295" Received: from ironmsg04-r.qualcomm.com ([172.30.46.18]) by sabertooth01.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 13 Nov 2014 01:19:14 -0800 X-IronPort-AV: E=Sophos;i="5.07,375,1413270000"; d="scan'208";a="844111852" Received: from nasanexm01e.na.qualcomm.com ([10.46.201.191]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/RC4-SHA; 13 Nov 2014 01:19:14 -0800 Received: from jouni.qca.qualcomm.com (10.80.80.8) by NASANEXM01E.na.qualcomm.com (10.46.201.191) with Microsoft SMTP Server (TLS) id 15.0.913.22; Thu, 13 Nov 2014 01:19:13 -0800 From: Jouni Malinen To: "John W. Linville" CC: , Subject: [PATCH] wireless-regdb: Reorder country codes to be in alphabetical order Date: Thu, 13 Nov 2014 11:18:38 +0200 Message-ID: <1415870318-8505-1-git-send-email-jouni@qca.qualcomm.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01C.na.qualcomm.com (129.46.53.236) To NASANEXM01E.na.qualcomm.com (10.46.201.191) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This makes it easier to write (semi-)automated synchronization and validation scripts against external databases. I'd assume this order was already supposed to be used, but couple of the countries have been placed in incorrect locations in the file over the years. Signed-off-by: Jouni Malinen --- db.txt | 134 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/db.txt b/db.txt index 6cf86e1..df7f7b1 100644 --- a/db.txt +++ b/db.txt @@ -411,19 +411,6 @@ country FR: DFS-ETSI # 60 gHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40) -country GE: DFS-ETSI - (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (18), AUTO-BW - (5250 - 5330 @ 80), (18), DFS, AUTO-BW - # 60 gHz band channels 1-4, ref: Etsi En 302 567 - (57000 - 66000 @ 2160), (40) - -country GF: DFS-ETSI - (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (20), AUTO-BW - (5250 - 5330 @ 80), (20), DFS, AUTO-BW - (5490 - 5710 @ 160), (27), DFS - country GB: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20), AUTO-BW @@ -439,6 +426,19 @@ country GD: DFS-FCC (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) +country GE: DFS-ETSI + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (18), AUTO-BW + (5250 - 5330 @ 80), (18), DFS, AUTO-BW + # 60 gHz band channels 1-4, ref: Etsi En 302 567 + (57000 - 66000 @ 2160), (40) + +country GF: DFS-ETSI + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (20), AUTO-BW + (5250 - 5330 @ 80), (20), DFS, AUTO-BW + (5490 - 5710 @ 160), (27), DFS + country GH: DFS-FCC (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (17), AUTO-BW @@ -446,6 +446,12 @@ country GH: DFS-FCC (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) +country GL: DFS-ETSI + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (20) + (5250 - 5330 @ 80), (20), DFS + (5490 - 5710 @ 80), (27), DFS + country GP: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20), AUTO-BW @@ -460,12 +466,6 @@ country GR: DFS-ETSI # 60 gHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40) -country GL: DFS-ETSI - (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (20) - (5250 - 5330 @ 80), (20), DFS - (5490 - 5710 @ 80), (27), DFS - country GT: DFS-FCC (2402 - 2472 @ 40), (30) (5170 - 5250 @ 80), (17), AUTO-BW @@ -483,18 +483,18 @@ country GY: (2402 - 2482 @ 40), (30) (5735 - 5835 @ 80), (30) -country HN: DFS-FCC +country HK: (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (17), AUTO-BW (5250 - 5330 @ 80), (24), DFS, AUTO-BW - (5490 - 5730 @ 160), (24), DFS + (5490 - 5710 @ 160), (24), DFS (5735 - 5835 @ 80), (30) -country HK: +country HN: DFS-FCC (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (17), AUTO-BW (5250 - 5330 @ 80), (24), DFS, AUTO-BW - (5490 - 5710 @ 160), (24), DFS + (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) country HR: DFS-ETSI @@ -544,6 +544,10 @@ country IN: DFS-JP (5250 - 5330 @ 80), (20), DFS, AUTO-BW (5735 - 5835 @ 80), (20) +country IR: DFS-JP + (2402 - 2482 @ 40), (20) + (5735 - 5835 @ 80), (30) + country IS: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20), AUTO-BW @@ -552,10 +556,6 @@ country IS: DFS-ETSI # 60 gHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40) -country IR: DFS-JP - (2402 - 2482 @ 40), (20) - (5735 - 5835 @ 80), (30) - country IT: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20), AUTO-BW @@ -571,6 +571,11 @@ country JM: DFS-FCC (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) +country JO: DFS-JP + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (23) + (5735 - 5835 @ 80), (23) + country JP: DFS-JP (2402 - 2482 @ 40), (20) (2474 - 2494 @ 20), (20), NO-OFDM @@ -580,11 +585,6 @@ country JP: DFS-JP (5250 - 5330 @ 80), (20), DFS, AUTO-BW (5490 - 5710 @ 160), (23), DFS -country JO: DFS-JP - (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (23) - (5735 - 5835 @ 80), (23) - country KE: DFS-JP (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (23) @@ -696,16 +696,16 @@ country LV: DFS-ETSI # 60 gHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40) -country MC: DFS-ETSI +country MA: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20), AUTO-BW (5250 - 5330 @ 80), (20), DFS, AUTO-BW - (5490 - 5710 @ 160), (27), DFS -country MA: DFS-ETSI +country MC: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20), AUTO-BW (5250 - 5330 @ 80), (20), DFS, AUTO-BW + (5490 - 5710 @ 160), (27), DFS # Source: # http://www.cnfr.md/index.php?pag=sec&id=117&l=en @@ -729,12 +729,6 @@ country MF: DFS-ETSI (5250 - 5330 @ 80), (20), DFS, AUTO-BW (5490 - 5710 @ 160), (27), DFS -country MO: - (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 40), (23) - (5250 - 5330 @ 40), (23), DFS - (5735 - 5835 @ 40), (30) - country MH: DFS-FCC (2402 - 2472 @ 40), (30) (5170 - 5250 @ 80), (24), AUTO-BW @@ -757,6 +751,12 @@ country MN: DFS-FCC (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) +country MO: + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 40), (23) + (5250 - 5330 @ 40), (23), DFS + (5735 - 5835 @ 40), (30) + country MP: DFS-FCC (2402 - 2472 @ 40), (30) (5170 - 5250 @ 80), (24), AUTO-BW @@ -799,17 +799,17 @@ country MW: DFS-ETSI (5250 - 5330 @ 80), (20), DFS, AUTO-BW (5490 - 5710 @ 160), (27), DFS -country MY: DFS-FCC +country MX: DFS-FCC (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (17), AUTO-BW - (5250 - 5330 @ 80), (23), DFS, AUTO-BW + (5250 - 5330 @ 80), (24), DFS, AUTO-BW + (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) -country MX: DFS-FCC +country MY: DFS-FCC (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (17), AUTO-BW - (5250 - 5330 @ 80), (24), DFS, AUTO-BW - (5490 - 5730 @ 160), (24), DFS + (5250 - 5330 @ 80), (23), DFS, AUTO-BW (5735 - 5835 @ 80), (30) country NI: DFS-FCC @@ -912,6 +912,13 @@ country PM: DFS-ETSI (5250 - 5330 @ 80), (20), DFS, AUTO-BW (5490 - 5710 @ 160), (27), DFS +country PR: DFS-FCC + (2402 - 2472 @ 40), (30) + (5170 - 5250 @ 80), (17), AUTO-BW + (5250 - 5330 @ 80), (24), DFS, AUTO-BW + (5490 - 5730 @ 160), (24), DFS + (5735 - 5835 @ 80), (30) + country PT: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20), AUTO-BW @@ -920,13 +927,6 @@ country PT: DFS-ETSI # 60 gHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40) -country PR: DFS-FCC - (2402 - 2472 @ 40), (30) - (5170 - 5250 @ 80), (17), AUTO-BW - (5250 - 5330 @ 80), (24), DFS, AUTO-BW - (5490 - 5730 @ 160), (24), DFS - (5735 - 5835 @ 80), (30) - country PW: DFS-FCC (2402 - 2472 @ 40), (30) (5170 - 5250 @ 80), (24), AUTO-BW @@ -1065,13 +1065,6 @@ country TG: DFS-ETSI (5250 - 5330 @ 40), (20), DFS (5490 - 5710 @ 40), (27), DFS -country TW: DFS-JP - (2402 - 2472 @ 40), (30) - (5270 - 5330 @ 40), (17), DFS - (5490 - 5590 @ 80), (30), DFS - (5650 - 5710 @ 40), (30), DFS - (5735 - 5835 @ 80), (30) - country TH: DFS-FCC (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (17), AUTO-BW @@ -1079,13 +1072,6 @@ country TH: DFS-FCC (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) -country TT: DFS-FCC - (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (17), AUTO-BW - (5250 - 5330 @ 80), (24), DFS, AUTO-BW - (5490 - 5730 @ 160), (24), DFS - (5735 - 5835 @ 80), (30) - country TN: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20), AUTO-BW @@ -1098,6 +1084,20 @@ country TR: DFS-ETSI (5490 - 5710 @ 160), (27), DFS # 60 gHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40) + +country TT: DFS-FCC + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (17), AUTO-BW + (5250 - 5330 @ 80), (24), DFS, AUTO-BW + (5490 - 5730 @ 160), (24), DFS + (5735 - 5835 @ 80), (30) + +country TW: DFS-JP + (2402 - 2472 @ 40), (30) + (5270 - 5330 @ 40), (17), DFS + (5490 - 5590 @ 80), (30), DFS + (5650 - 5710 @ 40), (30), DFS + (5735 - 5835 @ 80), (30) # Source: # #914 / 06 Sep 2007: http://www.ucrf.gov.ua/uk/doc/nkrz/1196068874