From patchwork Wed Jun 17 15:08:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 1311295 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; dmarc=none (p=none dis=none) header.from=phrozen.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=bombadil.20170209 header.b=rLixpShE; 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 49n7kw5jL9z9sRR for ; Thu, 18 Jun 2020 01:09:12 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=mjNGxGG97YY1VOg8sITxFwXkWyqTcRN+piBPtRLqydA=; b=rLixpShEXiWSQa oEV0AuH/mNy55ZtRg4c4EmGdgoJJgakP1Jbq2IJg2+GUf8IsYsrNZvMGaBSjjSYMWpPOtAC5LMzhX QUDzMVL0pMeQgVir8NXqvOSlloP9feJH4xCKihsUDv0hESAQcX9m371izvtW4DBUPN1LUArBPPd7F SeUAI2BULXZVz5Q3T57vqxmGOFeVhoDn6dqy8nJmb1+ySd6gHlBDRP2Xt4me/zhaVunSk0FFe+yXZ CIo7KXF6s0tPxc29KiWuUd1QC8QNsxpb7kGZjNOx8tWHtTh4/s6Jg8e85NImRbiIgW3P31+Sl3w7b rluTUgeBDFOgare2Fz2w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jlZgQ-0001Y2-R5; Wed, 17 Jun 2020 15:08:58 +0000 Received: from nbd.name ([2a01:4f8:221:3d45::2]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jlZg8-0001EM-N4 for hostap@lists.infradead.org; Wed, 17 Jun 2020 15:08:43 +0000 Received: from [134.101.215.41] (helo=localhost.localdomain) by ds12 with esmtpa (Exim 4.89) (envelope-from ) id 1jlZg6-0005Ej-H9; Wed, 17 Jun 2020 17:08:38 +0200 From: John Crispin To: hostap@lists.infradead.org Subject: [PATCH 4/6] bss coloring: disable BSS color during CAC Date: Wed, 17 Jun 2020 17:08:34 +0200 Message-Id: <20200617150836.4183882-4-john@phrozen.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200617150836.4183882-1-john@phrozen.org> References: <20200617150836.4183882-1-john@phrozen.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200617_080840_903084_9FF0EB30 X-CRM114-Status: GOOD ( 11.30 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 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: John Crispin Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org While we are doing CAC the bss color disable bit inside the he oper field needs to be set. Signed-off-by: John Crispin --- src/ap/ieee802_11_he.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ap/ieee802_11_he.c b/src/ap/ieee802_11_he.c index a7fc4164b..269bcd833 100644 --- a/src/ap/ieee802_11_he.c +++ b/src/ap/ieee802_11_he.c @@ -192,7 +192,7 @@ u8 * hostapd_eid_he_operation(struct hostapd_data *hapd, u8 *eid) params |= (hapd->conf->he_op.he_rts_threshold << HE_OPERATION_RTS_THRESHOLD_OFFSET); - if (hapd->conf->he_op.he_bss_color_disabled) + if (hapd->conf->he_op.he_bss_color_disabled || hapd->cca_in_progress) params |= HE_OPERATION_BSS_COLOR_DISABLED; if (hapd->conf->he_op.he_bss_color_partial) params |= HE_OPERATION_BSS_COLOR_PARTIAL;