From nobody Sun Sep 21 17:47:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cVDGg2qPPz67jpj; Sun, 21 Sep 2025 17:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cVDGg293hz3HF1; Sun, 21 Sep 2025 17:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758476859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vRCxEYvrAC4vwHZ5DZTqZAcXcNKPdmx9Rm8GnkErU8M=; b=cy39P4MjHIhYWu4+BuucIZMN212f5hUM0bWRSyDwvZ3ndt8HbsEtjumO3tTJqQBFC3+9D8 uba+5/l3qH3sYqpCSOud/X8VWNqPMveQJnzZqaEoU8oOWpD78WYFGn/Kw3ukR1iDxHZ8Fs /L5+3AivLzGklhtdnZBBt0YiZT5rND2ATrLxxe+LNngZIs4gd5hstwElUhmuOBJgBCTljc pwURAwTvATZgp00or1zKQ5FdUWwZebBWDyQ7sVpoujnhtFS7eQOix34pgnjsGXEKXXIhQE 1dzzrql6RkRErN3+0c4sGt42uXey+c4Hj2m7HpAPrn+//ZBkgKDxIYWOgxEZGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758476859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vRCxEYvrAC4vwHZ5DZTqZAcXcNKPdmx9Rm8GnkErU8M=; b=QORfPDd5yP15ZmbzzyC6FZ/ANs9F057ADUBZZDVVpZrYq9o1zfyyh/nsghlIAckg3slGDA dBgh2IwOlB/U3GOnUVCjRbYTZXw3VTNx5vNqR9sztMIVuywy3nsoExPsueuCKQH1BkxFhW w6rJ7hTKJrtqFogH+bum5chkGl668arXeXpqdf2wrnjp5uUYvAOAlBVh5BHTP0vu/W6Sap xGgRa0Y+yyy+6dVtt5ld+gz2USzTzd1Nu4PgRTiPvXhQoVaOkEsaHS5AFgfjETSu/0dZPv raMOM1Lqwndq7RH1hdXeIuSYLoSmqA+/Wi9h1aBhdpq77G+drUMqWicomLJASw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758476859; a=rsa-sha256; cv=none; b=MbxbrbWMbnhnOIB6NqFoi/Cm3DYsJYQtmJIdbne2TujaVI5WGKiZaiXCInIb7EMVoIV9Kg GqVm1c5P4/OBDKGCIumK3fJco3UA+zr2oDARm4bwuA34IfpPCHjUQMkDqMt3Cm0Av7m5Jr HYZcHJUQ9XYScR/2jfj5SqEvHQlsI/cgiMwURu6MVhfx/PUlXicXmxtChboKbiKH0TOxk7 N4T80k1/TfPiziF24lg7/iq41V48G3UWBaapN/Mx49UeQc/V7hMQBcys8AQEgnpSBIfERU e5LScj4pSlXqEf/S6m9HoIvCIhbPFL7qR276kpzJWfo3pJIz2TWaALVtwh9Jaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cVDGg1grDz8cl; Sun, 21 Sep 2025 17:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58LHldxq038316; Sun, 21 Sep 2025 17:47:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58LHldQe038313; Sun, 21 Sep 2025 17:47:39 GMT (envelope-from git) Date: Sun, 21 Sep 2025 17:47:39 GMT Message-Id: <202509211747.58LHldQe038313@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 522455887078 - main - iwx: re-add sequence numbers for non-AMPDU, preserving previous behaviour List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52245588707851f3175551bf3934e206ca2b6ad7 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=52245588707851f3175551bf3934e206ca2b6ad7 commit 52245588707851f3175551bf3934e206ca2b6ad7 Author: Adrian Chadd AuthorDate: 2025-09-21 01:55:00 +0000 Commit: Adrian Chadd CommitDate: 2025-09-21 17:47:18 +0000 iwx: re-add sequence numbers for non-AMPDU, preserving previous behaviour I received a report on freebsd-wireless@ that traffic stopped working. It seems that although my AX210 is fine with this change, the AX201/22000 hardware/firmware seems to require it. There's a bit to set in the TX command to force the FW to set the sequence control. We only set a few flags, and we don't set that. So, add the sequence number allocation where encryption is performed. Locally tested: * AX210, STA mode * AX201, STA mode Differential Revision: https://reviews.freebsd.org/D52652 Reviewed by: kevans Tested by: kevans --- sys/dev/iwx/if_iwx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c index 3b29c8e78b97..8422fcb787c3 100644 --- a/sys/dev/iwx/if_iwx.c +++ b/sys/dev/iwx/if_iwx.c @@ -5673,8 +5673,9 @@ iwx_tx(struct iwx_softc *sc, struct mbuf *m, struct ieee80211_node *ni) if (rinfo == NULL) return EINVAL; - /* Offloaded sequence number assignment */ - /* Note: Should be done in firmware on all supported devices */ + /* Offloaded sequence number assignment; non-AMPDU case */ + if ((m->m_flags & M_AMPDU_MPDU) == 0) + ieee80211_output_seqno_assign(ni, -1, m); /* Radiotap */ if (ieee80211_radiotap_active_vap(vap)) {