From patchwork Mon Jun 22 06:40:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pradeep Kumar Chitrapu X-Patchwork-Id: 1314612 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=FkjvT6Jk; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=casper.20170209 header.b=mnjtbw5u; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.a=rsa-sha256 header.s=smtp header.b=X/QJz6JG; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49rFCw4Nkbz9sRR for ; Tue, 23 Jun 2020 02:26:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=Zr6yU88dbXNu79nXfqa5beLxMKZfT8FMyumTPocGGgk=; b=FkjvT6JkMev8tBPoJEh9LbooQb LjOZT9X6LC+TVaf8pKNz0Z5ZkeqoIPg9esqvBUKf+t1xYbij+/eCf4vcl9qn5uXqDxMNFuMQ0QGwK wQVji7vYBUbHB+X/5lJwtAbNrTnRC3yRtb/oCMlELLJT/I1TgpcDlcTEAPIqJYfQlgNZpbnU+8hP7 adwRbsTPoCQKEkUh+OESG3EznuGriRILE1RcMtEtdoQg67HjgR8yL4S4yY+khX9Y2YDeDU3+4domT ADAgV9wDZ2eFsWJBLCKoRpgIOgzVVyY8oboo3MYAiRqyEUEaxuNTUqg2D0r6nBxEjbEOwozQcn9xI UYPqgbRw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnPFU-0007ck-Cs; Mon, 22 Jun 2020 16:24:44 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnLkl-0006aE-El for hostap@merlin.infradead.org; Mon, 22 Jun 2020 12:40:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To:References; bh=o+3h08QMnhQ9uQCEsk2FKSQE30ziMqtzMAFPbbV/+jg=; b=mnjtbw5u8bB20isnEgm1y9c74q gLvzNZ7+fY6YR7PHZSO19E5JjYMzkM8IhKpKsy6duNH2Scb/y+RY4ZK1CdGpB6GEo4CsaBsirzfsb c/i8Ky2lZcpL79ADr/9nKICPHUDOxKpD8bOfYp9p6PoFoa8cF36G/ogGWuxhuI+D+ovfLO3eo8XPy 2LUikQWWuyMcZlwqPRbs0C4P11Ox6EglinFMWS6O+8OnWFySl6zgdxGK9x1NzWbSJJqW2czScsfka TM7YzoKWyBeXVc/ZhtKImYwNRypBEduvd9WmgNTePkZWqaGpdJryT1RgG2PTHVcMV107w6+tFTc/N bv73/v7A==; Received: from mail29.static.mailgun.info ([104.130.122.29]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnG80-0000iJ-RW for hostap@lists.infradead.org; Mon, 22 Jun 2020 06:40:27 +0000 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1592808022; h=Message-Id: Date: Subject: Cc: To: From: Sender; bh=o+3h08QMnhQ9uQCEsk2FKSQE30ziMqtzMAFPbbV/+jg=; b=X/QJz6JGMaZuNPXBGZPc+RyY8N0gN+z7VYs1m3zzYVM4Q3HCdprbvlRWAcDyHSS+jq7J++1E O0nJn/Gt/ijSISQPZHUeVKE9WK5aHB7GFWZbWMYsNrmdCw0QNOMylcqQC7y2G2/oL6yzALhk PVp3p464Ck3FMEsn5fD93FlSjAg= X-Mailgun-Sending-Ip: 104.130.122.29 X-Mailgun-Sid: WyJkMjNkOSIsICJob3N0YXBAbGlzdHMuaW5mcmFkZWFkLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n02.prod.us-west-2.postgun.com with SMTP id 5ef05254fe1db4db8908e6ef (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 22 Jun 2020 06:40:20 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id CC637C433C6; Mon, 22 Jun 2020 06:40:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=ALL_TRUSTED,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.0 Received: from pradeepc2-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: pradeepc) by smtp.codeaurora.org (Postfix) with ESMTPSA id 53183C433C6; Mon, 22 Jun 2020 06:40:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 53183C433C6 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=pradeepc@codeaurora.org From: Pradeep Kumar Chitrapu To: hostap@lists.infradead.org Subject: [PATCH 1/3] 6G: Fix enabling 40/80MHz bandwidth support in 6GHZ Date: Sun, 21 Jun 2020 23:40:12 -0700 Message-Id: <20200622064014.25012-1-pradeepc@codeaurora.org> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200622_074025_124046_AF7E69A3 X-CRM114-Status: GOOD ( 12.61 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.4 on casper.infradead.org summary: Content analysis details: (-1.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [104.130.122.29 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [104.130.122.29 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Mailman-Approved-At: Mon, 22 Jun 2020 12:24:42 -0400 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pradeep Kumar Chitrapu MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Currently 40/80 MHz bandwidth setting is being rejected due to incorrect sanity check. so fix that. Fixes: d7c2c5c9 (AP: Add initial support for 6 GHz band) Signed-off-by: Pradeep Kumar Chitrapu --- src/common/hw_features_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/hw_features_common.c b/src/common/hw_features_common.c index f6c67a375037..1d9387f70b56 100644 --- a/src/common/hw_features_common.c +++ b/src/common/hw_features_common.c @@ -415,7 +415,7 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data, return -1; } - if (center_idx_to_bw_6ghz(channel) != 0) { + if (center_idx_to_bw_6ghz(channel) < 0) { wpa_printf(MSG_ERROR, "Invalid control channel for 6 GHz band"); return -1; From patchwork Mon Jun 22 06:40:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pradeep Kumar Chitrapu X-Patchwork-Id: 1314613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=g1EtqSFh; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=casper.20170209 header.b=WdfHI2Jx; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.a=rsa-sha256 header.s=smtp header.b=pLo8Pg7r; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49rFCv6fY6z9sQt for ; Tue, 23 Jun 2020 02:26:35 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rRJIE1Mz33Rfhbj+mj4dOXHfvJNMj6BxNMVaNnaujwE=; b=g1EtqSFhE0m+ywhf/l1BSyGcvm DIiIJen4yz4J9DerL5EcOv0goToSwBpbvlNA/6EYHHysO3E23941MafLKXwCcB9enYwZlkDHUCVlT AhYuhnaDxy5bt0dweQ+CsL9CcfRf7gP8OU7VIc4ATOs7lRuoA7kPG4RIUc3Hvy756zfGFljRcs/mn 1pjlJVaAohIjk6LkYK+CqBC9w8j4TKuSTAHEWnU/CROyfKX7Nx7T4OORM7Lz71ctpAYP0MXVzoSaT 4CtVSd6QcHp34tjvxysBR7MgJisKPYuK72dglYcajkS38ZLupwgk8eSxrbKmijKSWLr43YINgNuVV HTigy4Dg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnPFV-0007dD-RG; Mon, 22 Jun 2020 16:24:45 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnLlB-0006nG-Jv for hostap@merlin.infradead.org; Mon, 22 Jun 2020 12:41:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=aULF4yBHZvkDTpGmXivOt+ViTRE5Mta/Ruuw3VsuP/4=; b=WdfHI2Jx9d6++CcRRQSjAIaW7h VwJnsqDYVehvJfnNWX/WxvnRye7pSaodFxgZQ5Hs+stGFeU12MmnSnQal1K5rH7ndMW/e5WpxtHSw /K2tmORMmY2m303H6s3/4LDGoWTyfJKorfsc5MlcXTRnXn3Zxg4B33BRPnZfvKN6hEKINbHMR3hv/ YrMxvYflU7CGJdhjeA58oEHeYa8OLLzqi1GGWkVH+9Ey3563GZJKQG50oE2qvmBevoBVF162lgHuP uuy1mKET00+vzyscj3OuL77ibiPH9G4gGMm3EF3zz5LeuJanAV5yMuul+Vu/yvUbvANJPgYldnUvD 0CEK42eA==; Received: from mail29.static.mailgun.info ([104.130.122.29]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnG81-0000iY-PM for hostap@lists.infradead.org; Mon, 22 Jun 2020 06:40:29 +0000 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1592808026; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=aULF4yBHZvkDTpGmXivOt+ViTRE5Mta/Ruuw3VsuP/4=; b=pLo8Pg7rHSnJLimRAj2oa0rgt5EexesGvQ2kVXeLiwC/hJ0l/TdWipeI8k/0oXlTbogmhdym KsWGiRbB5BXrxZSMm09wT9sXTLXRu9f2eUbq6t/8VQOlCl34TyttSKXG0bhPSXIFOf6nFFN/ XlDngR0gZtzMf+Opj6uS9eFiDc0= X-Mailgun-Sending-Ip: 104.130.122.29 X-Mailgun-Sid: WyJkMjNkOSIsICJob3N0YXBAbGlzdHMuaW5mcmFkZWFkLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n01.prod.us-west-2.postgun.com with SMTP id 5ef052565866879c76fd866d (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 22 Jun 2020 06:40:22 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 871D4C433CA; Mon, 22 Jun 2020 06:40:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=ALL_TRUSTED,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.0 Received: from pradeepc2-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: pradeepc) by smtp.codeaurora.org (Postfix) with ESMTPSA id AB842C433C8; Mon, 22 Jun 2020 06:40:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org AB842C433C8 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=pradeepc@codeaurora.org From: Pradeep Kumar Chitrapu To: hostap@lists.infradead.org Subject: [PATCH 2/3] 6G: update 6GHz frequencies per latest spec IEEE P802.11ax/D6.1 Date: Sun, 21 Jun 2020 23:40:13 -0700 Message-Id: <20200622064014.25012-2-pradeepc@codeaurora.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200622064014.25012-1-pradeepc@codeaurora.org> References: <20200622064014.25012-1-pradeepc@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200622_074027_258362_B287CAC9 X-CRM114-Status: GOOD ( 16.02 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.4 on casper.infradead.org summary: Content analysis details: (-1.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [104.130.122.29 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [104.130.122.29 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Mailman-Approved-At: Mon, 22 Jun 2020 12:24:43 -0400 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pradeep Kumar Chitrapu MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org There is change in 6GHz start/end frequencies between IEEE P802.11ax/D6.0 and IEEE P802.11ax/D6.1. So fix that. Signed-off-by: Pradeep Kumar Chitrapu --- src/common/ieee802_11_common.c | 16 ++++++++-------- wpa_supplicant/op_classes.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/common/ieee802_11_common.c b/src/common/ieee802_11_common.c index c4e744693d56..32d429fbc9fe 100644 --- a/src/common/ieee802_11_common.c +++ b/src/common/ieee802_11_common.c @@ -1029,9 +1029,9 @@ enum hostapd_hw_mode ieee80211_freq_to_channel_ext(unsigned int freq, return HOSTAPD_MODE_IEEE80211A; } - if (freq > 5940 && freq <= 7105) { + if (freq > 5950 && freq <= 7115) { int bw; - u8 idx = (freq - 5940) / 5; + u8 idx = (freq - 5950) / 5; bw = center_idx_to_bw_6ghz(idx); if (bw < 0) @@ -1418,7 +1418,7 @@ static int ieee80211_chan_to_freq_global(u8 op_class, u8 chan) case 135: /* UHB channels, 80+80 MHz: 7, 23, 39.. */ if (chan < 1 || chan > 233) return -1; - return 5940 + chan * 5; + return 5950 + chan * 5; case 180: /* 60 GHz band, channels 1..8 */ if (chan < 1 || chan > 8) return -1; @@ -2208,10 +2208,10 @@ int center_idx_to_bw_6ghz(u8 idx) int is_6ghz_freq(int freq) { - if (freq < 5940 || freq > 7105) + if (freq < 5950 || freq > 7115) return 0; - if (center_idx_to_bw_6ghz((freq - 5940) / 5) < 0) + if (center_idx_to_bw_6ghz((freq - 5950) / 5) < 0) return 0; return 1; @@ -2230,12 +2230,12 @@ int is_6ghz_psc_frequency(int freq) if (!is_6ghz_freq(freq)) return 0; - if ((((freq - 5940) / 5) & 0x3) != 0x1) + if ((((freq - 5950) / 5) & 0x3) != 0x1) return 0; - i = (freq - 5940 + 55) % 80; + i = (freq - 5950 + 55) % 80; if (i == 0) - i = (freq - 5940 + 55) / 80; + i = (freq - 5950 + 55) / 80; if (i >= 1 && i <= 15) return 1; diff --git a/wpa_supplicant/op_classes.c b/wpa_supplicant/op_classes.c index 983801faa421..ec0b5a989c8a 100644 --- a/wpa_supplicant/op_classes.c +++ b/wpa_supplicant/op_classes.c @@ -27,8 +27,8 @@ static enum chan_allowed allow_channel(struct hostapd_hw_modes *mode, for (i = 0; i < mode->num_channels; i++) { int chan_is_6ghz; - chan_is_6ghz = mode->channels[i].freq > 5940 && - mode->channels[i].freq <= 7105; + chan_is_6ghz = mode->channels[i].freq > 5950 && + mode->channels[i].freq <= 7115; if (is_6ghz == chan_is_6ghz && mode->channels[i].chan == chan) break; } From patchwork Mon Jun 22 06:40:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pradeep Kumar Chitrapu X-Patchwork-Id: 1314614 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=bvWhriiS; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=casper.20170209 header.b=ojPjysRd; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.a=rsa-sha256 header.s=smtp header.b=uGKkkAUW; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49rFCw0ctdz9sQx for ; Tue, 23 Jun 2020 02:26:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mB28Wy09X2C124t1L5cwyvrE5nLGt4fctYhyuVaE7bs=; b=bvWhriiSrccM5K12zRSaLoYKlg Gw4IHfnudVxQBthsxzPPRMjFZ2svX7RHeO4WR7u2ori2coWJ3oidPekvrijKWXcCJRjDR8DgocEoQ 44MyCyBwYcIxeif5FTdx3qnpXPMgQ2d/ts+ug/LMg6IDCP9Jp1+dGfzDDRfpA4boWd8/g6+N0D1lK GFKrMWFjLWTPIGO5T1EryOG5T6ety1HT5QpoVuSQRlvsqzZunZkRkhJjM4MOJtZynl2dr63hWc95B ijVdx52oWBiTuCVc7yGjI+G/55bB9aJnaYca4/zeuDj87mY1wWGADLIxBZxK1gIfkar6r7S+y0m64 dyfXsIpw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnPFX-0007df-3M; Mon, 22 Jun 2020 16:24:47 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnLvo-0004EN-QI for hostap@merlin.infradead.org; Mon, 22 Jun 2020 12:52:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=w7i7mmkLLEQDsb9XXLKG25Y7L0hhoZCGI2rh//td7GY=; b=ojPjysRdggxvuF/ZOBiKH+Z5f3 KxRVXJGLKUR03JmxQxfF4QjT4r8bmXPgDYo9N4LqP1dg++qetS29poOtnhbh648xFu27g//ewrN8/ 5kv+QVJKH9Ro1xUiL6ycJO2ga23i70cqtMbfJed7pgDO9my71H2kLP9Kv3kXzkm6orlbbIq6dwm3i guB22WlVqK4SEbptmPmSRv8bhhPJ4XeQmXpuZASHLGrPorKLsa93kGTs6CM0jbb+hEoGzTxGvV39B 7vPSacOo4IBAVQPYV8YdnEiwfuLRwv6vBHVUk+MYrBF2lvJBFhGKYXJ81p8i6+aerwNYUMFJ5sAtY 60VeEYHA==; Received: from mail29.static.mailgun.info ([104.130.122.29]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnG84-0000iw-Uy for hostap@lists.infradead.org; Mon, 22 Jun 2020 06:40:33 +0000 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1592808031; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=w7i7mmkLLEQDsb9XXLKG25Y7L0hhoZCGI2rh//td7GY=; b=uGKkkAUWb2prYvqDSTDNndepInEWmV2iwVZkci2BNCYcucDAKFBTmt4N3Sfiz28Vf/uPM+qK iF+yA8c38A9bLenZnz9NXllAmLG0ndJMRy+7+npYaz+AiLr8uP+VbemcwHbPDSb9tf7Ol2WS 5Vkl+eVzhZaJq84CYP7Hn4K3lJ8= X-Mailgun-Sending-Ip: 104.130.122.29 X-Mailgun-Sid: WyJkMjNkOSIsICJob3N0YXBAbGlzdHMuaW5mcmFkZWFkLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n01.prod.us-west-2.postgun.com with SMTP id 5ef05255f3deea03f3797e0a (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 22 Jun 2020 06:40:21 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 82274C433CB; Mon, 22 Jun 2020 06:40:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=ALL_TRUSTED,SPF_NONE autolearn=ham autolearn_force=no version=3.4.0 Received: from pradeepc2-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: pradeepc) by smtp.codeaurora.org (Postfix) with ESMTPSA id 0B446C433C6; Mon, 22 Jun 2020 06:40:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 0B446C433C6 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=pradeepc@codeaurora.org From: Pradeep Kumar Chitrapu To: hostap@lists.infradead.org Subject: [PATCH 3/3] 6G: update missing channel 2 for 6GHZ Date: Sun, 21 Jun 2020 23:40:14 -0700 Message-Id: <20200622064014.25012-3-pradeepc@codeaurora.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200622064014.25012-1-pradeepc@codeaurora.org> References: <20200622064014.25012-1-pradeepc@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200622_074031_703040_029EED13 X-CRM114-Status: GOOD ( 16.92 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.4 on casper.infradead.org summary: Content analysis details: (-1.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [104.130.122.29 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [104.130.122.29 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Mailman-Approved-At: Mon, 22 Jun 2020 12:24:43 -0400 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pradeep Kumar Chitrapu MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This adds 6GHz channel 2 with center frequency 5935MHz which is the new addition in latest specification IEEE P802.11ax/D6.1. Signed-off-by: Pradeep Kumar Chitrapu --- src/common/ieee802_11_common.c | 18 +++++++++++++++--- wpa_supplicant/op_classes.c | 7 ++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/common/ieee802_11_common.c b/src/common/ieee802_11_common.c index 32d429fbc9fe..625b581172e8 100644 --- a/src/common/ieee802_11_common.c +++ b/src/common/ieee802_11_common.c @@ -1029,6 +1029,11 @@ enum hostapd_hw_mode ieee80211_freq_to_channel_ext(unsigned int freq, return HOSTAPD_MODE_IEEE80211A; } + if (freq == 5935) { + *op_class = 136; + return HOSTAPD_MODE_IEEE80211A; + } + if (freq > 5950 && freq <= 7115) { int bw; u8 idx = (freq - 5950) / 5; @@ -1419,6 +1424,10 @@ static int ieee80211_chan_to_freq_global(u8 op_class, u8 chan) if (chan < 1 || chan > 233) return -1; return 5950 + chan * 5; + case 136: /* UHB channel, 20MHz: 2 */ + if (chan != 2) + return -1; + return 5935; case 180: /* 60 GHz band, channels 1..8 */ if (chan < 1 || chan > 8) return -1; @@ -2190,7 +2199,7 @@ int oper_class_bw_to_int(const struct oper_class_map *map) int center_idx_to_bw_6ghz(u8 idx) { /* channels: 1, 5, 9, 13... */ - if ((idx & 0x3) == 0x1) + if ((idx & 0x3) == 0x1 || idx == 2) return 0; /* 20 MHz */ /* channels 3, 11, 19... */ if ((idx & 0x7) == 0x3) @@ -2208,6 +2217,9 @@ int center_idx_to_bw_6ghz(u8 idx) int is_6ghz_freq(int freq) { + if (freq == 5935) + return 1; + if (freq < 5950 || freq > 7115) return 0; @@ -2220,7 +2232,7 @@ int is_6ghz_freq(int freq) int is_6ghz_op_class(u8 op_class) { - return op_class >= 131 && op_class <= 135; + return op_class >= 131 && op_class <= 136; } @@ -2228,7 +2240,7 @@ int is_6ghz_psc_frequency(int freq) { int i; - if (!is_6ghz_freq(freq)) + if (!is_6ghz_freq(freq) || freq == 5935) return 0; if ((((freq - 5950) / 5) & 0x3) != 0x1) return 0; diff --git a/wpa_supplicant/op_classes.c b/wpa_supplicant/op_classes.c index ec0b5a989c8a..b46844f82025 100644 --- a/wpa_supplicant/op_classes.c +++ b/wpa_supplicant/op_classes.c @@ -22,13 +22,14 @@ static enum chan_allowed allow_channel(struct hostapd_hw_modes *mode, unsigned int *flags) { int i; - int is_6ghz = op_class >= 131 && op_class <= 135; + int is_6ghz = op_class >= 131 && op_class <= 136; for (i = 0; i < mode->num_channels; i++) { int chan_is_6ghz; - chan_is_6ghz = mode->channels[i].freq > 5950 && - mode->channels[i].freq <= 7115; + chan_is_6ghz = mode->channels[i].freq == 5935 || + (mode->channels[i].freq > 5950 && + mode->channels[i].freq <= 7115); if (is_6ghz == chan_is_6ghz && mode->channels[i].chan == chan) break; }