Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp955446ybi; Fri, 2 Aug 2019 07:04:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqyu/PUEjbmGt7qeGCtnW/Kf73Qf32Q4brUjWz/nrpFFjjMAqS2jlwP1Fjw6KsDMXxWSDepX X-Received: by 2002:a17:902:9f81:: with SMTP id g1mr129366325plq.17.1564754670955; Fri, 02 Aug 2019 07:04:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564754670; cv=none; d=google.com; s=arc-20160816; b=N9OECyTvW9Q7NgSpTnI6bS4hIKP+cBojdzGKlUIIyN7aiHZZhLtG67iH8ZM3MIcu87 Y8OVvKbgBzboSeQn4VjgUJWtR59WpzwjVX7RvfkDeo7c19xL8pVt9RReBqyUMH0TCfy7 Ae86KleVWMBOZgBPFIsvKPDU7m2TbDIEqecRN4mYVIA97Xr/fWInMVav6MHEoJCVv4UY YGlyg2UPzky99zxYXbH2OXpMImehrP/YeDA5+1Q8lYeZRaVnToTHbb61vAvSGzvHHv/U D13rfRPuionZvAwhTUDH535FaYn4dAHIDPnhkEgcZxVYGQNAanly33HrVy+tROPwENu8 Zhgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=a+QY3meZ1cpwR+j5PgBq1OAZ+DJymVG9YFzk7QjmNb8=; b=MdFuQygdz9yfg1FUoQ9qlZpeGt33Cc2ezhbWYPxDAxiW4kFaIetgkeuv1IOgkesDb7 1etohznJp+lMx9tFuN26QuUlGSgRXLpSRu2J08qzV5Ei8MmXEMUBo6w/xYZ4TEWPYbdX oikrLQYNOJvqb0+Xq7z7NL989YKt6QCy/bmwpHz6BJ4BuXRnK18ztsqGfWQROOayliBk vKMdaXGCzrMjUmRx2/mYmJIW+TR3N+YZcW6aHcGibOPH/R/9SJOkJuBuGlilHje2PqpA 1M0lYSIshaUVNYHWskZMeiz4wetyabBkCZuuv5y+gaBQwsI+6/79rfcq/RDMrGU0W7/M SEOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@broadcom.com header.s=dkimrelay header.b=FJfiQOK0; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p27si34871399pli.411.2019.08.02.07.04.04; Fri, 02 Aug 2019 07:04:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-wireless-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=@broadcom.com header.s=dkimrelay header.b=FJfiQOK0; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391861AbfHBLbX (ORCPT + 99 others); Fri, 2 Aug 2019 07:31:23 -0400 Received: from rnd-relay.smtp.broadcom.com ([192.19.229.170]:49788 "EHLO rnd-relay.smtp.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732737AbfHBLbX (ORCPT ); Fri, 2 Aug 2019 07:31:23 -0400 Received: from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net [10.75.224.233]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id BF8CC30C033; Fri, 2 Aug 2019 04:31:21 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com BF8CC30C033 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1564745481; bh=rpQAs7STKtoHtjNm9J3r/4stIf2rSMHlSRSwPmzr0wA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FJfiQOK0gDWwDP10L+O3SuoDQt8yHcqV+3ztZfOkOUBKncG/o7zNrrjTZQ6k0JFmJ FiKYFU1W2iVQGO9LVoCA70VGnU/fws7ipo8apQK0lwnz296tuCd7UJhK8ab8g/5Oaw TBR/3UOjkUqI+OA0YgAdU5Rk+5lyNSXtOiO95sNM= Received: from bld-bun-01.bun.broadcom.com (bld-bun-01.bun.broadcom.com [10.176.128.83]) by mail-irv-17.broadcom.com (Postfix) with ESMTP id 89AE860D7B; Fri, 2 Aug 2019 04:31:21 -0700 (PDT) Received: by bld-bun-01.bun.broadcom.com (Postfix, from userid 25152) id 4C97BB00693; Fri, 2 Aug 2019 13:31:19 +0200 (CEST) From: Arend van Spriel To: Johannes Berg Cc: linux-wireless@vger.kernel.org, Arend van Spriel Subject: [PATCH V3 3/8] cfg80211: util: add 6GHz channel to freq conversion and vice versa Date: Fri, 2 Aug 2019 13:31:00 +0200 Message-Id: <1564745465-21234-4-git-send-email-arend.vanspriel@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1564745465-21234-1-git-send-email-arend.vanspriel@broadcom.com> References: <1564745465-21234-1-git-send-email-arend.vanspriel@broadcom.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Extend the functions ieee80211_channel_to_frequency() and ieee80211_frequency_to_channel() to support 6GHz band according specification in 802.11ax D4.1 27.3.22.2. Reviewed-by: Pieter-Paul Giesberts Reviewed-by: Leon Zegers Signed-off-by: Arend van Spriel --- net/wireless/util.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net/wireless/util.c b/net/wireless/util.c index 1c39d6a..4e633d4 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -91,6 +91,11 @@ int ieee80211_channel_to_frequency(int chan, enum nl80211_band band) else return 5000 + chan * 5; break; + case NL80211_BAND_6GHZ: + /* see 802.11ax D4.1 27.3.22.2 */ + if (chan <= 253) + return 5940 + chan * 5; + break; case NL80211_BAND_60GHZ: if (chan < 7) return 56160 + chan * 2160; @@ -111,8 +116,11 @@ int ieee80211_frequency_to_channel(int freq) return (freq - 2407) / 5; else if (freq >= 4910 && freq <= 4980) return (freq - 4000) / 5; - else if (freq <= 45000) /* DMG band lower limit */ + else if (freq < 5940) return (freq - 5000) / 5; + else if (freq <= 45000) /* DMG band lower limit */ + /* see 802.11ax D4.1 27.3.22.2 */ + return (freq - 5940) / 5; else if (freq >= 58320 && freq <= 70200) return (freq - 56160) / 2160; else -- 1.9.1