From patchwork Wed Oct 25 04:45:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ryan Mounce X-Patchwork-Id: 10025831 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B866E60381 for ; Wed, 25 Oct 2017 04:47:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B0A928AD6 for ; Wed, 25 Oct 2017 04:47:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E86028ADA; Wed, 25 Oct 2017 04:47:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39C7328AD6 for ; Wed, 25 Oct 2017 04:47:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750948AbdJYErd (ORCPT ); Wed, 25 Oct 2017 00:47:33 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:57124 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750780AbdJYErc (ORCPT ); Wed, 25 Oct 2017 00:47:32 -0400 Received: by mail-pg0-f66.google.com with SMTP id m18so16347368pgd.13 for ; Tue, 24 Oct 2017 21:47:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mounce.com.au; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pcriNPOOLfNLgpjmfNPxIXSj2BkJnJbyg88lDrv6YnE=; b=ogrZ3rg/MpzVsWq+iX48MqSth0fuW40zUUUbKjY1ePKrp4sLUA13jDhEAikjE+n4/P 3v6fPk1TnF/VI9DK0hHXESHv5/MHXrbjHa/bpQtSMmkZifv6yLooqjDtu9tkOsYaNG8T u7cCzcCT4XW6BmO2MDgUVj6EZ/q5lc3h2guW7z7ZiM/jCK/yO7i3atEA8P2asIX8XMvx DWvWdSDi2icsxK6cP/J4GnQsi/ceM9GaemvSkVHiHdJJqU2oc5rFPry1SHnTgRffKZyZ G+V9ReYJwx51ZknJKkM5UOF45WFf8axFfQTvwRq7dnjrq7Y1sfwRmSm0Igc+DfvTa+b5 9yfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pcriNPOOLfNLgpjmfNPxIXSj2BkJnJbyg88lDrv6YnE=; b=tHz2MG85k3/zTu0mnTS5DJ71qNru+RrxSzrvr7z3K7vSJji5QmPFk/vnOXWQINgoXa tlKBKbvWlzMRc6aFsMx2jIOKzVljBmDDFtJ486AoZD3vOQID7bWXWSqbfIkcTZ19fkTv CXHFPaPsWAWJZUz0gxCwo5chwFJdl4iZ1zp1bp2a+HkwwL5fyB5h0OXghxIoUIcur7iV kQVndx3tceh7e6//wha1d3xShjHTYDSodmpoVgOzty6Tx57iZXov6xS/Sad9QE2M/i/b A8kM7OboQ5VRnNTLafk6uq5obyT5jgzHfX3La3/byNOa4uoS6yjhPu0axJtc1H5BxuxR YTEg== X-Gm-Message-State: AMCzsaWEKEzlyMTEhv5HCWOzJXSJQ86Qs0whGewZmx8/F4tGJJx2Wa2o Rc/fnb1cwTb5njiXDrZiqaz1bA== X-Google-Smtp-Source: ABhQp+SZAPxwW9OXFf3eiy30U9b3eGd57j9b6FSOp3n7vgJRmNknElmPmOAwy/7OxtZ3A6oMbpRsRg== X-Received: by 10.84.177.129 with SMTP id x1mr751288plb.165.1508906851239; Tue, 24 Oct 2017 21:47:31 -0700 (PDT) Received: from rmmbp-eth.adl0.in.vxnd.net ([101.166.206.167]) by smtp.gmail.com with ESMTPSA id b23sm2948418pfm.148.2017.10.24.21.47.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Oct 2017 21:47:30 -0700 (PDT) From: Ryan Mounce To: seth.forshee@canonical.com Cc: wireless-regdb@lists.infradead.org, linux-wireless@vger.kernel.org, Ryan Mounce Subject: [PATCH] wireless-regdb: convert remaining values in mW to equivalent dBm Date: Wed, 25 Oct 2017 15:15:39 +1030 Message-Id: <20171025044539.17877-1-ryan@mounce.com.au> X-Mailer: git-send-email 2.13.5 (Apple Git-94) MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch converts the few remaining rules specified in mW to directly equivalent rules in dBm, to improve consistency of the regdb. Signed-off-by: Ryan Mounce --- db.txt | 64 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/db.txt b/db.txt index 9d129f2..8ea5a66 100644 --- a/db.txt +++ b/db.txt @@ -305,7 +305,7 @@ country CR: DFS-FCC # - Redes Informáticas # Resolución 127, 2011 - Reglamento Banda 2,4 GHz. country CU: DFS-FCC - (2400 - 2483.5 @ 40), (200 mW) + (2400 - 2483.5 @ 40), (23) country CX: DFS-FCC (2402 - 2482 @ 40), (20) @@ -327,10 +327,10 @@ country CY: DFS-ETSI # Power at 5250 - 5350 MHz and 5470 - 5725 MHz can be doubled if TPC is # implemented. country CZ: DFS-ETSI - (2400 - 2483.5 @ 40), (100 mW) - (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW - (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW - (5470 - 5725 @ 160), (500 mW), DFS + (2400 - 2483.5 @ 40), (20) + (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW + (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW + (5470 - 5725 @ 160), (27), DFS # 60 GHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40) @@ -362,12 +362,12 @@ country CZ: DFS-ETSI # https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Frequenzen/Allgemeinzuteilungen/2011_08_MGWS_pdf.pdf country DE: DFS-ETSI - (2400 - 2483.5 @ 40), (100 mW) - (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR, AUTO-BW - (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW - (5470 - 5725 @ 160), (500 mW), DFS + (2400 - 2483.5 @ 40), (20) + (5150 - 5250 @ 80), (20), NO-OUTDOOR, AUTO-BW + (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW + (5470 - 5725 @ 160), (27), DFS # short range devices (ETSI EN 300 440-1) - (5725 - 5875 @ 80), (25 mW) + (5725 - 5875 @ 80), (14) # 60 GHz band channels 1-4 (ETSI EN 302 567) (57000 - 66000 @ 2160), (40) @@ -427,12 +427,12 @@ country EG: DFS-ETSI # http://www.minetur.gob.es/telecomunicaciones/espectro/paginas/cnaf.aspx country ES: DFS-ETSI - (2400 - 2483.5 @ 40), (100 mW) - (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW - (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW - (5470 - 5725 @ 160), (500 mW), DFS + (2400 - 2483.5 @ 40), (20) + (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW + (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW + (5470 - 5725 @ 160), (27), DFS # Short Range Devices (SRD) (ETSI EN 300 440) - (5725 - 5875 @ 80), (25 mW) + (5725 - 5875 @ 80), (14) # 60 GHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40) @@ -589,8 +589,8 @@ country IE: DFS-ETSI country IL: DFS-ETSI (2402 - 2482 @ 40), (20) - (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW - (5250 - 5350 @ 80), (200 mW), NO-OUTDOOR, DFS, AUTO-BW + (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW + (5250 - 5350 @ 80), (23), NO-OUTDOOR, DFS, AUTO-BW country IN: (2402 - 2482 @ 40), (20) @@ -639,7 +639,7 @@ country JP: DFS-JP (5490 - 5710 @ 160), (23), DFS # 60 GHz band channels 2-4 at 10mW, # ref: http://www.arib.or.jp/english/html/overview/doc/1-STD-T74v1_1.pdf - (59000 - 66000 @ 2160), (10 mW) + (59000 - 66000 @ 2160), (10) country KE: DFS-JP (2402 - 2482 @ 40), (20) @@ -856,10 +856,10 @@ country MU: DFS-FCC # Source: # http://www.cam.gov.mv/docs/tech_standards/TAM-TS-100-2004-WLAN.pdf country MV: DFS-ETSI - (2400 - 2483.5 @ 40), (100 mW) - (5150 - 5250 @ 80), (200 mW), AUTO-BW - (5250 - 5350 @ 80), (100 mW), DFS, AUTO-BW - (5725 - 5850 @ 80), (100 mW) + (2400 - 2483.5 @ 40), (20) + (5150 - 5250 @ 80), (23), AUTO-BW + (5250 - 5350 @ 80), (20), DFS, AUTO-BW + (5725 - 5850 @ 80), (20) country MW: DFS-ETSI (2402 - 2482 @ 40), (20) @@ -904,7 +904,7 @@ country NL: DFS-ETSI (5250 - 5330 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW (5490 - 5710 @ 160), (27), DFS # short range devices (ETSI EN 300 440-1) - (5725 - 5875 @ 80), (25 mW) + (5725 - 5875 @ 80), (14) # 60 GHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40) @@ -914,12 +914,12 @@ country NL: DFS-ETSI # Up to 2W (or 4W with TPC) is allowed in the 5725 – 5795 MHz band # which has been merged with 5470 - 5725 MHz to allow wide channels country NO: DFS-ETSI - (2400 - 2483.5 @ 40), (100 mW) - (5150 - 5250 @ 80), (200 mW), AUTO-BW - (5250 - 5350 @ 80), (100 mW), DFS, AUTO-BW - (5470 - 5795 @ 160), (500 mW), DFS - (5815 - 5850 @ 35), (2000 mW), DFS - (17100 - 17300 @ 200), (100 mW) + (2400 - 2483.5 @ 40), (20) + (5150 - 5250 @ 80), (23), AUTO-BW + (5250 - 5350 @ 80), (20), DFS, AUTO-BW + (5470 - 5795 @ 160), (27), DFS + (5815 - 5850 @ 35), (33), DFS + (17100 - 17300 @ 200), (20) # 60 GHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40) @@ -1044,9 +1044,9 @@ country RO: DFS-ETSI # Source: # http://www.ratel.rs/upload/documents/Plan_namene/Plan_namene-sl_glasnik.pdf country RS: DFS-ETSI - (2400 - 2483.5 @ 40), (100 mW) - (5150 - 5350 @ 40), (200 mW), NO-OUTDOOR - (5470 - 5725 @ 20), (1000 mW), DFS + (2400 - 2483.5 @ 40), (20) + (5150 - 5350 @ 40), (23), NO-OUTDOOR + (5470 - 5725 @ 20), (30), DFS # 60 GHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40)