From patchwork Tue Jan 27 16:10:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Kondratiev X-Patchwork-Id: 5718631 X-Patchwork-Delegate: johannes@sipsolutions.net 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 4384DC058D for ; Tue, 27 Jan 2015 16:11:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A5C5220219 for ; Tue, 27 Jan 2015 16:11:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8312A20145 for ; Tue, 27 Jan 2015 16:11:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758200AbbA0QL1 (ORCPT ); Tue, 27 Jan 2015 11:11:27 -0500 Received: from wolverine01.qualcomm.com ([199.106.114.254]:19732 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752119AbbA0QL1 (ORCPT ); Tue, 27 Jan 2015 11:11:27 -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=1422375087; x=1453911087; h=from:cc:to:subject:date:message-id; bh=UAPhYQBkt3yf3a0xakx5P4GqpQ/kAvqfUO+P+yCTozU=; b=wX6AVvIHCcFFHTj4vpDaaVQU72j4MgSbcaOFHsxh+LLIpBD4MLrIWCrX GwPy0m9wlqzROAXmlinbHHVfE44/CYAM2I7BTfTmm/UY48TPS31XMXivB u4IA9FCRFuIxf9kXMT95MLX/SzZrAkEheZDFN/ZHxQhQe1TcXKNn3xX0P 8=; X-IronPort-AV: E=McAfee;i="5600,1067,7693"; a="100404055" Received: from ironmsg03-l.qualcomm.com ([172.30.48.18]) by wolverine01.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 27 Jan 2015 08:11:26 -0800 From: Vladimir Kondratiev Cc: linux-wireless@vger.kernel.org, Vladimir Kondratiev X-IronPort-AV: E=Sophos;i="5.09,475,1418112000"; d="scan'208";a="826974581" Received: from lx-wigig-72.mea.qualcomm.com ([10.18.176.26]) by Ironmsg03-L.qualcomm.com with ESMTP; 27 Jan 2015 08:11:24 -0800 To: Johannes Berg Subject: [PATCH] cfg80211: fix world_regdom's n_reg_rules Date: Tue, 27 Jan 2015 18:10:51 +0200 Message-Id: <1422375051-20709-1-git-send-email-qca_vkondrat@qca.qualcomm.com> X-Mailer: git-send-email 2.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=-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 In the commit: 131a19b - regulatory: enable channels 52-64 and 100-144 for world roaming 2 entries added to the world_regdom.reg_rules, while world_regdom.n_reg_rules was not updated to reflect array size. Fix it. Signed-off-by: Vladimir Kondratiev --- 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 b586d0d..48dfc7b 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 */