From patchwork Wed May 7 15:02:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "John W. Linville" X-Patchwork-Id: 4129561 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 8A967BFF02 for ; Wed, 7 May 2014 15:15:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A9DF02016C for ; Wed, 7 May 2014 15:15:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 894EE2015E for ; Wed, 7 May 2014 15:15:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756286AbaEGPPX (ORCPT ); Wed, 7 May 2014 11:15:23 -0400 Received: from charlotte.tuxdriver.com ([70.61.120.58]:41474 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755443AbaEGPPW (ORCPT ); Wed, 7 May 2014 11:15:22 -0400 Received: from uucp by smtp.tuxdriver.com with local-rmail (Exim 4.63) (envelope-from ) id 1Wi3Yv-0002Am-Ee; Wed, 07 May 2014 11:15:13 -0400 Received: from linville-x1.hq.tuxdriver.com (localhost.localdomain [127.0.0.1]) by linville-x1.hq.tuxdriver.com (8.14.8/8.14.6) with ESMTP id s47F2TlU019185; Wed, 7 May 2014 11:02:29 -0400 Received: (from linville@localhost) by linville-x1.hq.tuxdriver.com (8.14.8/8.14.8/Submit) id s47F2SuP019184; Wed, 7 May 2014 11:02:28 -0400 From: "John W. Linville" To: wireless-regdb@lists.infradead.org Cc: =?UTF-8?q?Christian=20S=C3=BCnkenberg?= , "Luis R. Rodriguez" , linux-wireless@vger.kernel.org, "John W. Linville" Subject: [PATCH] wireless-regdb: correct some flag damage... Date: Wed, 7 May 2014 11:02:00 -0400 Message-Id: <1399474920-19147-1-git-send-email-linville@tuxdriver.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <20140507150032.GB20432@tuxdriver.com> References: <20140507150032.GB20432@tuxdriver.com> MIME-Version: 1.0 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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 It seems that commit e56cd9618e3e ("wireless-regdb: remove antenna gain") accidentally dropped anything beyond the first flag in an entry. Subsequently, commit d806b5e3ba73 ("wireless-regdb: optimize two of DE's rules"), commit 788445b48c2e ("wireless-regdb: optimize two of IL's rules"), and commit 13286f2c259b ("wireless-regdb: optimize two of NL's rules") dutifully combined the newly/incorrectly compatible rules with their neighbors... FWIW, this one-liner was used to find the entries that lost flags: git show e56cd9618e3e | grep -n '^-[^,]*,[^,]*,[^,]*,[^,]*,' This patch corrects the damage above, including what is essentially a revert of the latter three commits. Reported-by: Christian Sünkenberg Cc: Luis R. Rodriguez Signed-off-by: John W. Linville --- db.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/db.txt b/db.txt index fcab208d1813..f4749c228cea 100644 --- a/db.txt +++ b/db.txt @@ -4,7 +4,7 @@ country 00: # Channel 12 - 13. (2457 - 2482 @ 40), (20), NO-IR # Channel 14. Only JP enables this and for 802.11b only - (2474 - 2494 @ 20), (20), NO-IR + (2474 - 2494 @ 20), (20), NO-IR, NO-OFDM # Channel 36 - 48 (5170 - 5250 @ 80), (20), NO-IR # NB: 5260 MHz - 5700 MHz requies DFS @@ -207,7 +207,7 @@ country CY: DFS-ETSI country CZ: DFS-ETSI (2400 - 2483.5 @ 40), (100 mW) (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR - (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR + (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS (5470 - 5725 @ 80), (500 mW), DFS # 60 gHz band channels 1-4, ref: Etsi En 302 567 (57240 - 65880 @ 2160), (40), NO-OUTDOOR @@ -227,8 +227,10 @@ country CZ: DFS-ETSI country DE: DFS-ETSI # entries 279004 and 280006 (2400 - 2483.5 @ 40), (100 mW) - # entry 303005, 304002 and 305002 - (5150 - 5350 @ 80), (100 mW), NO-OUTDOOR + # entry 303005 + (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR + # entries 304002 and 305002 + (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS # entries 308002, 309001 and 310003 (5470 - 5725 @ 80), (500 mW), DFS # 60 gHz band channels 1-4, ref: Etsi En 302 567 @@ -277,7 +279,7 @@ country EG: DFS-ETSI country ES: DFS-ETSI (2400 - 2483.5 @ 40), (100 mW) (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR - (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR + (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS (5470 - 5725 @ 80), (500 mW), DFS # 60 gHz band channels 1-4, ref: Etsi En 302 567 (57240 - 65880 @ 2160), (40), NO-OUTDOOR @@ -398,7 +400,8 @@ country IE: DFS-ETSI country IL: DFS-ETSI (2402 - 2482 @ 40), (20) - (5150 - 5350 @ 80), (200 mW), NO-OUTDOOR + (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR + (5250 - 5350 @ 80), (200 mW), NO-OUTDOOR, DFS country IN: DFS-JP (2402 - 2482 @ 40), (20) @@ -574,7 +577,8 @@ country MX: DFS-FCC country NL: DFS-ETSI (2402 - 2482 @ 40), (20) - (5170 - 5330 @ 80), (20), NO-OUTDOOR + (5170 - 5250 @ 80), (20), NO-OUTDOOR + (5250 - 5330 @ 80), (20), NO-OUTDOOR, DFS (5490 - 5710 @ 80), (27), DFS # 60 gHz band channels 1-4, ref: Etsi En 302 567 (57240 - 65880 @ 2160), (40), NO-OUTDOOR