From nobody Tue Sep 2 03:29:44 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 4cGB7Y1P4lz66GvN; Tue, 02 Sep 2025 03:29:45 +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 4cGB7Y0vnJz3Q6d; Tue, 02 Sep 2025 03:29:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756783785; 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=+OwXnhPaZAArRK6khHkJfHHsVV+m9t76aSh4uLIZPWg=; b=wKaB5GipzAYYjuuKBZXXKl80NYCKt5Eawl5PEhXd3dA6NHFoUXaU7Qk7ZxpMOVfiOzS513 20TayT+LAWhRWnxwO/lfTqDo3orNpKxMKr8YuwVAk0UuxdP32yO+6uq/j80dtmqxWOXKrP dVqUgMpx3aBe6JoEDhaSnyXyTekdK1ZApZifId/Xm6LbpJ5pkjZplroiWPJ1cgDnX5QTu1 vPl1ziiTfBIcgtK2dEK31fVHn4NgkPPasx8aDsBeHylX0s8lPLS84aayrVjJJnwGvwVeLy R9Bw0ot3o6TIINJwEIHXL7y+cnBu/kFEc+os9OMD3Myx4dYdgxrS2ivi2+pXYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756783785; 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=+OwXnhPaZAArRK6khHkJfHHsVV+m9t76aSh4uLIZPWg=; b=CmALmLcuKnpppH7rACnbO2XlZJCM7v+jEWfFm/u20QxZ4iLGuYbloeh505WetXzo/ZKkP3 mFd1uiEdc+DBGgOLSvhNdRKSWc/WzehTQrEPyZDkxmJPz6D+swQUHTEZ744ica2BaKk7/m bQ8rT7YbLA5TyCDrXRjI9idNnNn79JRWG3GLx0SGPT2GPH+UlJYAh1ebGA8Jp3tXJ1gScM UciDSL6vedHOoyVMGw8P+XEks94ZpFzmzEo6wohHaw37bUlM1x+8H9m0nN43FIxHd8Yu6C 8d1SgUD4jjJrL0rWv9ZDoZ8eNTaD0voBWR/UFw2Cfz85dzS5ruJAQ1OVFrCjew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756783785; a=rsa-sha256; cv=none; b=KXjEdXPHxoO2Ts3TePJzS0N/ScTbL5z41ArGxSu/dXsYUkv2vz7VTtTJfZu98LXdFeQq0g lNBkRy9XR8ZgQeNYKwQ7th3yXNDFTUBjhgtdVVyp33xx3LWz22Q17EVnFbC6CDf8I1DuK0 zzIB43oXiz8Vcip2AlXKZcd6RpMZgorOOcLsI144plP1nbREBnqQODzf4E3Qy7IVkxKLrk 2pYDDd2AzPi/IrAymy0Mq7JpnlIPtyWWqlpQNFbCYpaeghbq/kp3oKnVOMPXzuFv40WSLM QrAGMgYGZjWuuri/eU+K62FWYECLVt5ig8eUfqmB0jM3P1uBwPJRC6fqfsYr9g== 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 4cGB7Y0TqczDBT; Tue, 02 Sep 2025 03:29:45 +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 5823TiKa018858; Tue, 2 Sep 2025 03:29:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5823TiLr018855; Tue, 2 Sep 2025 03:29:44 GMT (envelope-from git) Date: Tue, 2 Sep 2025 03:29:44 GMT Message-Id: <202509020329.5823TiLr018855@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: 167520e47d37 - main - [net80211] clean up M_SEQNO_SET and M_SEQNO_GET() to always limit to the sequence number range 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: 167520e47d37ab72ff5561c41b9a2d95e5d70bd5 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=167520e47d37ab72ff5561c41b9a2d95e5d70bd5 commit 167520e47d37ab72ff5561c41b9a2d95e5d70bd5 Author: Adrian Chadd AuthorDate: 2025-08-31 03:03:40 +0000 Commit: Adrian Chadd CommitDate: 2025-09-02 03:29:30 +0000 [net80211] clean up M_SEQNO_SET and M_SEQNO_GET() to always limit to the sequence number range Use '% IEEE80211_SEQ_RANGE' to limit the sequence numbers being stored and retrieved to 0..4095 inclusive. Differential Revision: https://reviews.freebsd.org/D52302 Reviewed by: bz --- sys/net80211/ieee80211_freebsd.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h index 3684fba52c5c..954801d95787 100644 --- a/sys/net80211/ieee80211_freebsd.h +++ b/sys/net80211/ieee80211_freebsd.h @@ -341,11 +341,16 @@ struct mbuf *ieee80211_getmgtframe(uint8_t **frm, int headroom, int pktlen); #define M_AGE_SUB(m,adj) (m->m_pkthdr.csum_data -= adj) /* - * Store the sequence number. + * Store / retrieve the sequence number in an mbuf. + * + * The sequence number being stored/retreived is the 12 bit + * base sequence number, not the 16 bit sequence number field. + * I.e., it's from 0..4095 inclusive, with no 4 bit padding for + * fragment numbers. */ #define M_SEQNO_SET(m, seqno) \ - ((m)->m_pkthdr.tso_segsz = (seqno)) -#define M_SEQNO_GET(m) ((m)->m_pkthdr.tso_segsz) + ((m)->m_pkthdr.tso_segsz = ((seqno) % IEEE80211_SEQ_RANGE)) +#define M_SEQNO_GET(m) (((m)->m_pkthdr.tso_segsz) % IEEE80211_SEQ_RANGE) #define MTAG_ABI_NET80211 1132948340 /* net80211 ABI */