From patchwork Fri Jan 23 11:51:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jouni Malinen X-Patchwork-Id: 5693071 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BB14FC058D for ; Fri, 23 Jan 2015 11:51:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C74E9202BE for ; Fri, 23 Jan 2015 11:51:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17F3020268 for ; Fri, 23 Jan 2015 11:51:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750932AbbAWLvk (ORCPT ); Fri, 23 Jan 2015 06:51:40 -0500 Received: from wolverine02.qualcomm.com ([199.106.114.251]:3047 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750870AbbAWLvj (ORCPT ); Fri, 23 Jan 2015 06:51:39 -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=1422013899; x=1453549899; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=oUFLOjDIokwOhQ3gAPurSHtbI7emgiFnSmgydR8t6b4=; b=rpkgk5OR70wajlYy0PODVCg94wZQsmD5BgTVZROkel89EEPt50jlM/Px 56+Tgvik25FlYxlRBxrQElT2ZvqfP0p6UIiWtuYlUWcyNDw62/M20gLkA f+XQGfZHCi7tG2nqhSmv4cJCxIYL8Upz6OIU1eyWXO8nPejwFamYxx3fb g=; X-IronPort-AV: E=McAfee;i="5600,1067,7689"; a="191586587" Received: from ironmsg04-r.qualcomm.com ([172.30.46.18]) by wolverine02.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 23 Jan 2015 03:51:38 -0800 X-IronPort-AV: E=Sophos;i="5.09,453,1418112000"; d="scan'208";a="890382811" Received: from nasanexm01e.na.qualcomm.com ([10.85.0.31]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/RC4-SHA; 23 Jan 2015 03:51:39 -0800 Received: from jouni.qca.qualcomm.com (10.80.80.8) by NASANEXM01E.na.qualcomm.com (10.85.0.31) with Microsoft SMTP Server (TLS) id 15.0.995.29; Fri, 23 Jan 2015 03:51:36 -0800 From: Jouni Malinen To: Seth Forshee CC: , Subject: [PATCH] wireless-regdb: Disable VHT80 where 40/80 MHz on 5 GHz is not allowed Date: Fri, 23 Jan 2015 13:51:12 +0200 Message-ID: <1422013872-9732-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 (10.85.0.83) To NASANEXM01E.na.qualcomm.com (10.85.0.31) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 VHT80 was incorrectly enabled for number of countries. 40 and 80 MHz channels are not allowed on 5 GHz for these: - Armenia (AM) - Bahrain (BH) - Costa Rica (CR) - Ecuador (EC) - Guam (GU) - Indonesia (ID) (also remove 40 MHz from 2.4 GHz) - North Korea (KP) - Sri Lanka (LK) - El Salvador (SV) 80 MHz channels are not allowed on 5 GHz for these: - Egypt (EG) - Russia (RU) Signed-off-by: Jouni Malinen --- db.txt | 74 +++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/db.txt b/db.txt index df7f7b1..ae8a216 100644 --- a/db.txt +++ b/db.txt @@ -54,8 +54,8 @@ country AL: DFS-ETSI country AM: DFS-ETSI (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (18) - (5250 - 5330 @ 80), (18), DFS + (5170 - 5250 @ 20), (18) + (5250 - 5330 @ 20), (18), DFS country AN: DFS-ETSI (2402 - 2482 @ 40), (20) @@ -146,9 +146,9 @@ country BG: DFS-ETSI country BH: DFS-JP (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (20) - (5250 - 5330 @ 80), (20), DFS - (5735 - 5835 @ 80), (20) + (5170 - 5250 @ 20), (20) + (5250 - 5330 @ 20), (20), DFS + (5735 - 5835 @ 20), (20) country BL: DFS-ETSI (2402 - 2482 @ 40), (20) @@ -263,10 +263,10 @@ country CO: DFS-FCC country CR: DFS-FCC (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (17) - (5250 - 5330 @ 80), (24), DFS - (5490 - 5730 @ 80), (24), DFS - (5735 - 5835 @ 80), (30) + (5170 - 5250 @ 20), (17) + (5250 - 5330 @ 20), (24), DFS + (5490 - 5730 @ 20), (24), DFS + (5735 - 5835 @ 20), (30) country CX: DFS-FCC (2402 - 2482 @ 40), (20) @@ -349,10 +349,10 @@ country DZ: DFS-JP country EC: DFS-FCC (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (17) - (5250 - 5330 @ 80), (24), DFS - (5490 - 5730 @ 80), (24), DFS - (5735 - 5835 @ 80), (30) + (5170 - 5250 @ 20), (17) + (5250 - 5330 @ 20), (24), DFS + (5490 - 5730 @ 20), (24), DFS + (5735 - 5835 @ 20), (30) country EE: DFS-ETSI (2402 - 2482 @ 40), (20) @@ -364,8 +364,8 @@ country EE: DFS-ETSI country EG: DFS-ETSI (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (20) - (5250 - 5330 @ 80), (20), DFS + (5170 - 5250 @ 40), (20) + (5250 - 5330 @ 40), (20), DFS # Orden IET/787/2013, de 25 de abril, por la que se aprueba # el cuadro nacional de atribución de frecuencias. @@ -474,10 +474,10 @@ country GT: DFS-FCC country GU: DFS-FCC (2402 - 2472 @ 40), (30) - (5170 - 5250 @ 80), (17) - (5250 - 5330 @ 80), (24), DFS - (5490 - 5730 @ 80), (24), DFS - (5735 - 5835 @ 80), (30) + (5170 - 5250 @ 20), (17) + (5250 - 5330 @ 20), (24), DFS + (5490 - 5730 @ 20), (24), DFS + (5735 - 5835 @ 20), (30) country GY: (2402 - 2482 @ 40), (30) @@ -522,8 +522,8 @@ country HU: DFS-ETSI country ID: DFS-JP # ref: http://www.postel.go.id/content/ID/regulasi/standardisasi/kepdir/bwa%205,8%20ghz.pdf - (2402 - 2482 @ 40), (20) - (5735 - 5815 @ 80), (23) + (2402 - 2482 @ 20), (20) + (5735 - 5815 @ 20), (23) country IE: DFS-ETSI (2402 - 2482 @ 40), (20) @@ -607,11 +607,11 @@ country KN: DFS-ETSI (5735 - 5815 @ 80), (30) country KP: DFS-JP - (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (20), AUTO-BW - (5250 - 5330 @ 80), (20), DFS, AUTO-BW - (5490 - 5630 @ 80), (30), DFS - (5735 - 5815 @ 80), (30) + (2402 - 2482 @ 20), (20) + (5170 - 5250 @ 20), (20) + (5250 - 5330 @ 20), (20), DFS + (5490 - 5630 @ 20), (30), DFS + (5735 - 5815 @ 20), (30) country KR: DFS-JP (2402 - 2482 @ 40), (20) @@ -659,10 +659,10 @@ country LI: DFS-ETSI country LK: DFS-FCC (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (17) - (5250 - 5330 @ 80), (24), DFS - (5490 - 5730 @ 80), (24), DFS - (5735 - 5835 @ 80), (30) + (5170 - 5250 @ 20), (17) + (5250 - 5330 @ 20), (24), DFS + (5490 - 5730 @ 20), (24), DFS + (5735 - 5835 @ 20), (30) # Source: # http://lca.org.ls/images/documents/lesotho_national_frequency_allocation_plan.pdf @@ -971,10 +971,10 @@ country RS: DFS-ETSI country RU: DFS-ETSI (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (20) - (5250 - 5330 @ 80), (20), DFS - (5650 - 5730 @ 80), (30), DFS - (5735 - 5835 @ 80), (30) + (5170 - 5250 @ 40), (20) + (5250 - 5330 @ 40), (20), DFS + (5650 - 5730 @ 40), (30), DFS + (5735 - 5835 @ 40), (30) country RW: DFS-FCC (2402 - 2482 @ 40), (20) @@ -1037,9 +1037,9 @@ country SR: DFS-ETSI country SV: DFS-FCC (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (17) - (5250 - 5330 @ 80), (23), DFS - (5735 - 5835 @ 80), (30) + (5170 - 5250 @ 20), (17) + (5250 - 5330 @ 20), (23), DFS + (5735 - 5835 @ 20), (30) country SY: (2402 - 2482 @ 40), (20)