Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp576718img; Fri, 22 Mar 2019 04:23:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqwto79l1A5k6ShsZx8yTaHUOQg0FabCQe4YIpWQPNtU/MxUfFrtYGGKC9rmJMJ8huB2/+eK X-Received: by 2002:a63:5ec2:: with SMTP id s185mr8290673pgb.27.1553253815474; Fri, 22 Mar 2019 04:23:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553253815; cv=none; d=google.com; s=arc-20160816; b=FisEqXwnshkuumyVbxMeNiR1cKWR+JeJVOKmnyT2IK0dIiFiq3bdQI/XrskadAqrdS 2iBFvVynU7SSueh0TsWqYR4QVoEFvwoOs2pNc66xfrXRdmeJLX5gsYewNPMQfB0S01w+ oD8Ktm/ONw9j45vfMjK4b9D0Rw9woA87rcFm99iTgDqzv5IU8DP3tDHmHSqn62D3dKbr 0WykjVaAE5mBiIdNIZ+1Tm8hU3Uzwign+iwkKQt2z3Pq2XCyCvjIdHhRUbHyZOzczyzi 7RMwzJ3xbjg/5NQu/mX1gh1rVRBI1VKm5BFcJ0zS4xfjrGLY0acUhpMtGUhgRJa0DNVz Qkyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wLXmwyQf7gdlNqwrprMe/WUU1sW3Xetg+LH+wWF45kU=; b=ROBXEjKUylplWm0x3+FPDDgWA0lIREtdqynbpDhwIhGdiAgQUevMBFp5PsjqabYAWI tkB6LBCPopTtojy1/MMF1GdisbGFngXvac/U7pOlJof/1BevOqyx6Lf7N/tC4anyWPO+ dP78Q4j2GU/29MdTvsvkqWhbwBmKJE4TFKKBkRpQej0to8aof5d8wy++JfSBek73Yj9I NrMbqltO4cYUaKpNSSrZNP0nxmz2+s/5yX5B+UKslN2E1LEV8cqG0vpIg8nV9JiLkDXH 1Ng3dQxkIFIhMUB5YjvEbFysCpi/cSHnZGVlIowmCHtVGRQVLbLlMPUaXbbn7cmFquE5 0E+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pvNpsB89; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w16si6707707pll.113.2019.03.22.04.23.20; Fri, 22 Mar 2019 04:23:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pvNpsB89; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728680AbfCVLVu (ORCPT + 99 others); Fri, 22 Mar 2019 07:21:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:48374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728274AbfCVLVt (ORCPT ); Fri, 22 Mar 2019 07:21:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D5357218D4; Fri, 22 Mar 2019 11:21:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253708; bh=/vW7i1qRGYpGkQShxZVTmrchSMJGhxnXdW/LkMgrcVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pvNpsB89E/AZl7ph2Xdm1u45puoXKf5K05O9X7XCB/LVhMroVvsvFKTpCUZUWi8vR XNz0nfMf48yVHZHEySPwTsV1ALutyKdcFSMFHaSVtlIor0KGJ0DhoRwvqn67+RxXPm /eDVnsN7ZgYhaVDCtQHehfiYRpIcYB4tc9vLGyts= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chaitanya Tata , Johannes Berg , Sasha Levin Subject: [PATCH 3.18 039/134] cfg80211: extend range deviation for DMG Date: Fri, 22 Mar 2019 12:14:12 +0100 Message-Id: <20190322111212.658067971@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 93183bdbe73bbdd03e9566c8dc37c9d06b0d0db6 ] Recently, DMG frequency bands have been extended till 71GHz, so extend the range check till 20GHz (45-71GHZ), else some channels will be marked as disabled. Signed-off-by: Chaitanya Tata Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/reg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 306464b3acdbb..2f1b39577a848 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -688,7 +688,7 @@ static bool reg_does_bw_fit(const struct ieee80211_freq_range *freq_range, * definitions (the "2.4 GHz band", the "5 GHz band" and the "60GHz band"), * however it is safe for now to assume that a frequency rule should not be * part of a frequency's band if the start freq or end freq are off by more - * than 2 GHz for the 2.4 and 5 GHz bands, and by more than 10 GHz for the + * than 2 GHz for the 2.4 and 5 GHz bands, and by more than 20 GHz for the * 60 GHz band. * This resolution can be lowered and should be considered as we add * regulatory rule support for other "bands". @@ -703,7 +703,7 @@ static bool freq_in_rule_band(const struct ieee80211_freq_range *freq_range, * with the Channel starting frequency above 45 GHz. */ u32 limit = freq_khz > 45 * ONE_GHZ_IN_KHZ ? - 10 * ONE_GHZ_IN_KHZ : 2 * ONE_GHZ_IN_KHZ; + 20 * ONE_GHZ_IN_KHZ : 2 * ONE_GHZ_IN_KHZ; if (abs(freq_khz - freq_range->start_freq_khz) <= limit) return true; if (abs(freq_khz - freq_range->end_freq_khz) <= limit) -- 2.19.1