From patchwork Mon Jul 1 12:39:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 1125263 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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.b="MJOG+bp/"; 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 45cn4r1T22z9s4V for ; Mon, 1 Jul 2019 22:39:40 +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=kPQDADwJCrb8F8EeGlxVRqPevB/PaXJgZa2bt7qpkZs=; b=MJOG+bp/vUiHPP 20UNbKZCS+UFB3QRRM3wR2ZVnPFw29UDxSDRmVwzI7w2oAQwvIpzozYKacYuya0ccEPUesQI4w5s4 ulqm5LiE0cu5yMEcSnC+9li9CRs0627zWg5ianMK5V7asQroDH6ErJdUorid5TxCoF4iIFztrxdpT 8ybn/6tXNpD6fsztbIv2Al7PYiokPB+3HzGDLTVWILqNqMgCuP//XcYoIxBu3bzZvWsxsQghr9q9P klfAYjUw99CV/D3STC96uJKOKsmyrow6aJ+TdAZMJZkIYvXuu399KHXdOz492vxTvgNw6zJ3jDVSN Nh44Ducgssz6XeFVZeEg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hhvaq-0000vm-RU; Mon, 01 Jul 2019 12:39:36 +0000 Received: from nbd.name ([2a01:4f8:221:3d45::2]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hhvao-0000uu-ND for hostap@lists.infradead.org; Mon, 01 Jul 2019 12:39:36 +0000 Received: from p5dcfb199.dip0.t-ipconnect.de ([93.207.177.153] helo=bertha.fritz.box) by ds12 with esmtpa (Exim 4.89) (envelope-from ) id 1hhvam-0000hj-JM; Mon, 01 Jul 2019 14:39:32 +0200 From: John Crispin To: Jouni Malinen Subject: [PATCH 2/2] HE: mcs size is always a minimum of 4 bytes Date: Mon, 1 Jul 2019 14:39:26 +0200 Message-Id: <20190701123926.25549-2-john@phrozen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190701123926.25549-1-john@phrozen.org> References: <20190701123926.25549-1-john@phrozen.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190701_053934_946045_53B70525 X-CRM114-Status: GOOD ( 12.05 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 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: hostap@lists.infradead.org, John Crispin Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The MCS set alwways has a minimal size of 4 bytes. Without this change HE20 failed to work. Signed-off-by: John Crispin --- src/ap/ieee802_11_he.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ap/ieee802_11_he.c b/src/ap/ieee802_11_he.c index bbf5d14b1..e92438f4b 100644 --- a/src/ap/ieee802_11_he.c +++ b/src/ap/ieee802_11_he.c @@ -79,7 +79,7 @@ u8 * hostapd_eid_he_capab(struct hostapd_data *hapd, u8 *eid, struct hostapd_hw_modes *mode = hapd->iface->current_mode; u8 he_oper_chwidth = ~HE_PHYCAP_CHANNEL_WIDTH_MASK; u8 *pos = eid; - u8 ie_size = 0, mcs_nss_size = 0, ppet_size = 0; + u8 ie_size = 0, mcs_nss_size = 4, ppet_size = 0; if (!mode) return eid; @@ -102,7 +102,6 @@ u8 * hostapd_eid_he_capab(struct hostapd_data *hapd, u8 *eid, case CHANWIDTH_USE_HT: he_oper_chwidth |= HE_PHYCAP_CHANNEL_WIDTH_SET_40MHZ_IN_2G | HE_PHYCAP_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G; - mcs_nss_size += 4; break; }