From patchwork Wed Feb 18 00:10:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Abele X-Patchwork-Id: 5842231 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B10E29F380 for ; Wed, 18 Feb 2015 00:12:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 02841200F2 for ; Wed, 18 Feb 2015 00:12:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 15287200DE for ; Wed, 18 Feb 2015 00:12:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752485AbbBRAM2 (ORCPT ); Tue, 17 Feb 2015 19:12:28 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:34158 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752197AbbBRAM1 (ORCPT ); Tue, 17 Feb 2015 19:12:27 -0500 Received: by pabrd3 with SMTP id rd3so10165233pab.1 for ; Tue, 17 Feb 2015 16:12:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=9Jq3hC+4a+DAScl+AUOiO4w2zmDLibM9HD1Hg3KFDxU=; b=hzsKZkRVRiCkCag7c2h83fXMTzMoECjKMr3zVfg1UIfjxkZaUFXgHITX7JbeBaBevJ Zh4WjfcwmTWTXgmL+JS+fS5i01qxPDtFUDvgdBTVJvCSbTl/+dKToft1g2B6HV+6ONjd Acc3Fhw20j3cN66GRIf4WRw3cbstm1hQX6hP4DcdZJutGed+yDX8LuqgR7glsGnypvh4 QXiLkDRQfFM0kSp68fjD4x5dga0txDdnLD5X1Ya4v+5yCQjazUdpjbH1tcA84JoipV2U /PVe2djHjUg6i4r2rCjp0OWIvXLbxk+ySW3elXEhA4Y7cfz2WxuosehDgEu8eHZN8tRU lzPw== X-Received: by 10.67.24.35 with SMTP id if3mr11292499pad.99.1424218347517; Tue, 17 Feb 2015 16:12:27 -0800 (PST) Received: from localhost.localdomain ([216.84.58.210]) by mx.google.com with ESMTPSA id fl4sm18991811pab.8.2015.02.17.16.12.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Feb 2015 16:12:26 -0800 (PST) From: Jason Abele To: Johannes Berg Cc: linux-wireless@vger.kernel.org Subject: [PATCH] cfg80211: fix n_reg_rules to match world_regdom Date: Tue, 17 Feb 2015 16:10:41 -0800 Message-Id: <1424218241-15747-1-git-send-email-jason.abele@gmail.com> X-Mailer: git-send-email 1.9.1 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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_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 From: Jason Abele There are currently 8 rules in the world_regdom, but only the first 6 are applied due to an incorrect value for n_reg_rules. This causes channels 149-165 and 60GHz to be disabled. Signed-off-by: Jason Abele --- net/wireless/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index d39d1cb..277be15 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -228,7 +228,7 @@ static DECLARE_DELAYED_WORK(reg_timeout, reg_timeout_work); /* We keep a static world regulatory domain in case of the absence of CRDA */ static const struct ieee80211_regdomain world_regdom = { - .n_reg_rules = 6, + .n_reg_rules = 8, .alpha2 = "00", .reg_rules = { /* IEEE 802.11b/g, channels 1..11 */