From nobody Wed Apr 22 21:07:59 2026 X-Original-To: dev-commits-src-all@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 4g1BdX18P9z6bKZM for ; Wed, 22 Apr 2026 21:08:00 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g1BdW55QCz3kNC for ; Wed, 22 Apr 2026 21:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776892079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D5m/+2FIRx3DI2ty+yG9xw5xiw6eq65lbNSEKDBs9JI=; b=lDnGV+jmwuW95p+/9yVp+dRA040JypVTqk/4Gv9598gFC9nMSsT3ggtIQPPPwBCanprHkn i8Ww+OBkLAAXpjMu0RTKidddlW1oadCK45pcCznfpD7VQXq/NCYeu4ZaxHVOIgrNI5Soul Oku7/OLoF2Xs+62QFTpWvWDjendE2xWXw4GbBqgQOjdBs+8ul0rxpVoPq1SooEelf9dFoU xJmVffFzNYZTX3oR51dn8hd61x0tONEPZuYtqrH/5RkLbyj79J6VVFe901zZmhiVrLuOMy AScKvSERNU0K00Y7t1oK22C0+8qI1fC78L5Tz37bX63Q5JubiQ4dilzL2Z3XKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776892079; a=rsa-sha256; cv=none; b=XlWbkSPIUd/AhJ8MKIh9QP3HZ3rFsWnv77g00a2O1B6tVF7cm4S8g36F7iwFN0qBoukxKk /IKqgovUDwK4AgghgfZz60A1BL5FMYo85+3Rwmn2cYCVAZGeOw1Icn2/l+KqInGCsgzVlW aqfeDFonP0tNcLPs4LPFrrk/T+fRynssuQSOOf1rLX06jVSfZTeAjXaZaMR7eE9oe84VRJ rEby0V6YnTA7a5pp/VVpl7LFq9bCLTZgEvQr+6tCCKG0st0doMvNezQJ5LB4JTLw+rLgqn ymN4oMKGYOREeELDoXWsz15XKfNKE7NtkptLcB+MDzdS7og57JUl4J6Noh8Z8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776892079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D5m/+2FIRx3DI2ty+yG9xw5xiw6eq65lbNSEKDBs9JI=; b=SU5MsKUyClwM46jgDXdD5uJxCFDgFpImttU6SBDjJk2CE+kk11Jk85QP+jytI9dsySh3c4 7GJlhiq6H8CzMv21/V7OIVUDuwNR+W6Ahob4XN2pvbZpOj0pFXLlCpiI1Dc4i+hU1EdjIR 2QX7/7cEdkT6uL9Fgbh3u4EXiDxL8j49E6g517m2hjsRvgpd3hir1pfjA37vKOj5gliPx+ OmbzHl3FATApMvaaRGSrG8UM1FeWaG7usGXiesevuB/OScfoxszgZVRk5tiTi9R8x8/y0C 1Bm9+ywH7DJadqvNe7n7n5MI7hWBMKkBJzfWcYvra10C9jesNXuDCVbsmLpI2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1BdW1Xd1znZ9 for ; Wed, 22 Apr 2026 21:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c4a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 21:07:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Adrian Chadd From: Bjoern A. Zeeb Subject: git: 99b3fd23ef0b - stable/15 - net80211: clean up time comparison in HT code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 99b3fd23ef0bf5428ff65cdb051adc4fdc12b900 Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 21:07:59 +0000 Message-Id: <69e938af.26c4a.283cd679@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=99b3fd23ef0bf5428ff65cdb051adc4fdc12b900 commit 99b3fd23ef0bf5428ff65cdb051adc4fdc12b900 Author: Adrian Chadd AuthorDate: 2025-12-15 03:45:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-22 20:56:51 +0000 net80211: clean up time comparison in HT code There's at least one place where the time comparison is wrong, leading to some bad beahaviour around deciding to try and establish/reestablish AMPDU TX sessions. Start addressing these! Differential Revision: https://reviews.freebsd.org/D54390 (cherry picked from commit 7a5288a023baeac2f0c3128506178f89fda3cc0d) --- sys/net80211/ieee80211_ht.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index 7817a7d0759d..9b2b0df33785 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -1131,7 +1131,8 @@ again: */ if (rap->rxa_qframes != 0) { /* XXX honor batimeout? */ - if (ticks - rap->rxa_age > ieee80211_ampdu_age) { + if (ieee80211_time_after(ticks - rap->rxa_age, + ieee80211_ampdu_age)) { /* * Too long since we received the first * frame; flush the reorder buffer. @@ -1393,7 +1394,8 @@ ieee80211_ht_node_age(struct ieee80211_node *ni) * See above for more details on what's happening here. */ /* XXX honor batimeout? */ - if (ticks - rap->rxa_age > ieee80211_ampdu_age) { + if (ieee80211_time_after(ticks - rap->rxa_age, + ieee80211_ampdu_age)) { /* * Too long since we received the first * frame; flush the reorder buffer. @@ -2825,7 +2827,7 @@ ieee80211_ampdu_request(struct ieee80211_node *ni, /* defer next try so we don't slam the driver with requests */ tap->txa_attempts = ieee80211_addba_maxtries; /* NB: check in case driver wants to override */ - if (tap->txa_nextrequest <= ticks) + if (ieee80211_time_before_eq(tap->txa_nextrequest, ticks)) tap->txa_nextrequest = ticks + ieee80211_addba_backoff; return 0; }