From patchwork Mon Aug 16 10:56:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: peterhuang X-Patchwork-Id: 1517125 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=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=YOlgzM3r; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=nctu.edu.tw header.i=@nctu.edu.tw header.a=rsa-sha256 header.s=google header.b=qHad24dA; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 4GpB3p3ScTz9s5R for ; Mon, 16 Aug 2021 20:58:46 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: MIME-Version:Reply-To:Cc:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=CCBy0lFi071VrU7W4vvQQceLCf73qjZqSFJLVKniej8=; b=YOl gzM3rUU2jepkadYX8+wN6ERll0uE/WV7ah/kArON9nKzDBylubzAe5ZxonuYHi3smWGUwMHVHhEEn ZtCsy6FH0Ol06fuaQwCozKFn3xKpjmTELdoysCKlMW/aqoi8Zsmt2ktXzOQ+L6OK0WD/QOpFptM/u Ssv+e4IqdX/qdEVSxYe4Tr/valjh1oAU712RUbCedu5NvBmpRI/mw3MkcFRFC3kJmwr08QLmIFiFG NLfxT8udYy/L3LbHS4PCNaDnC8X04SXF9WEOdAlzQSZbqvJ3ceXpDmLdqIfXb20zxkdAJDCG9TY6F aVAwq6pEgSjtHEYHj9JbN2zVbJPAcaQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mFaIr-00GmnW-GN; Mon, 16 Aug 2021 10:57:13 +0000 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mFaIk-00Gmjq-Ok for hostap@lists.infradead.org; Mon, 16 Aug 2021 10:57:11 +0000 Received: by mail-lj1-x234.google.com with SMTP id f2so4796214ljn.1 for ; Mon, 16 Aug 2021 03:57:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nctu.edu.tw; s=google; h=mime-version:from:date:message-id:subject:to; bh=HDyrDJSJpo190+7yfJliJWf4mpYmJjifQv7nitA9uEw=; b=qHad24dAeAuyozY3Prt5r2AXuyjKVWH3BQmCVGJvRlP92ozCRzu4jiO+FpNkyJHVr9 A3WPD3VC9RFm47ov6VJW4+DzJxgmBRTn7SHxYtivUMh5Ve/bQumoFYKxUdxEJscYg4hB 9GjsjhA0cTtQAcN2UUElHveL54MDB8eUGE7CRDl8qWiW+Bru67Z9MjglzvfECLkq8hzr VmDlahOdgYEB0I/8IKp9RinpP+OSvBNNEofX+PdgnrVEF+oKSFk2JeauqhmVIvqEJLGr RsXL+0Qsk6tnuUea5e++wKlKDZCTA5oQAZpleUWWf0kZcU+fQ5I5sMwh9J/RD1eXTlHi LRYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=HDyrDJSJpo190+7yfJliJWf4mpYmJjifQv7nitA9uEw=; b=OIBGecEEO850eyZNG9CnC2+0FJQfF8NgBiPkqWsikmjNlolhPiIqRDMM6UJ1irSk4q JNB+iJr/xsFV8OUJk2o7YKqs6A9/HxMCTQEbq7auga/vsmsusz4mrhjrYFNTTq4cZykc qSfdvuG+fCeEWrKgW/jmyX6mos+Nt3/u1ALYjSO9VKdkiGeTJuK+DJAAdI67iLWCTli5 lTKaa21ftg9QQ7ajkvF302nzBiNK6N97RovZ39X7eGkno4R+C9hVqw0PJUI8fQYZA8l5 7hMfCYHiU0877iFFqaKi+dvVYpyfF22N5SE2rk2sILp8PC5xoAT4J+UbyYoYrj4Sqs5a S1tw== X-Gm-Message-State: AOAM5306hc9pZH7TF3d20hYsJKXzJVIHu7Q8wUu57bOg4xOJ8MwdEViD 0EJjSlXEuP2sslLR1NLeIFLXTk5oaY546EmAOM/xCe3mpIBMgtNJ X-Google-Smtp-Source: ABdhPJzt/VhxOOPgS42tYpQt3PH3xAmc2jGCknUbQQmlGVL+CiNnJ3WLbpUeI2cRKbd8ZwdiWUJAaU5LsU7/wGuStFA= X-Received: by 2002:a2e:7018:: with SMTP id l24mr307496ljc.277.1629111424606; Mon, 16 Aug 2021 03:57:04 -0700 (PDT) MIME-Version: 1.0 From: peterhuang Date: Mon, 16 Aug 2021 18:56:54 +0800 Message-ID: Subject: [PATCH] Fix channel switch wrapper doesn't build when switching from HT to VHT/HE To: hostap@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210816_035706_847355_2B61BB87 X-CRM114-Status: GOOD ( 10.41 ) X-Spam-Score: -0.1 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From 2e70bb620afb541d491b0ff201880d329df30921 Mon Sep 17 00:00:00 2001 From: peterhuang Date: Mon, 16 Aug 2021 17:59:00 +0800 Subject: [PATCH] Fix channel switch wra [...] Content analysis details: (-0.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:234 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From 2e70bb620afb541d491b0ff201880d329df30921 Mon Sep 17 00:00:00 2001 From: peterhuang Date: Mon, 16 Aug 2021 17:59:00 +0800 Subject: [PATCH] Fix channel switch wrapper doesn't build when switching from HT to VHT/HE Because ieee80211ac and ieee80211ax don't update before channel switch done, hostapd doesn't build the channel switch wrapper element when it switches from HT to bandwidth more than 40M of VHT/HE. Signed-off-by: peterhuang --- src/ap/beacon.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) pos = hostapd_get_rsnxe(hapd, pos, epos - pos); @@ -1558,9 +1556,7 @@ int ieee802_11_build_ap_params(struct hostapd_data *hapd, tailpos = hostapd_eid_txpower_envelope(hapd, tailpos); #endif /* CONFIG_IEEE80211AX */ - if ((hapd->iconf->ieee80211ac && !hapd->conf->disable_11ac) || - (hapd->iconf->ieee80211ax && !hapd->conf->disable_11ax)) - tailpos = hostapd_eid_wb_chsw_wrapper(hapd, tailpos); + tailpos = hostapd_eid_wb_chsw_wrapper(hapd, tailpos); tailpos = hostapd_eid_fils_indic(hapd, tailpos, 0); tailpos = hostapd_get_rsnxe(hapd, tailpos, tailend - tailpos); diff --git a/src/ap/beacon.c b/src/ap/beacon.c index 15fc2b3db..096de6a2a 100644 --- a/src/ap/beacon.c +++ b/src/ap/beacon.c @@ -569,9 +569,7 @@ static u8 * hostapd_gen_probe_resp(struct hostapd_data *hapd, pos = hostapd_eid_txpower_envelope(hapd, pos); #endif /* CONFIG_IEEE80211AX */ - if ((hapd->iconf->ieee80211ac && !hapd->conf->disable_11ac) || - (hapd->iconf->ieee80211ax && !hapd->conf->disable_11ax)) - pos = hostapd_eid_wb_chsw_wrapper(hapd, pos); + pos = hostapd_eid_wb_chsw_wrapper(hapd, pos); pos = hostapd_eid_fils_indic(hapd, pos, 0);