From nobody Fri Feb 27 02:29:13 2026 X-Original-To: dev-commits-src-branches@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 4fMXMY4lssz6T7T2 for ; Fri, 27 Feb 2026 02:29:13 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMXMY43m1z40Sd for ; Fri, 27 Feb 2026 02:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159353; 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=rcs+Ddw4NLf9e1P9zfFSpg/If6e/dzANY2+kvFKdQa8=; b=WHNoBHaJQn5qlM6f4faFiE9ZZc1oXhZYYD/iJyHmd2qYQ8KnrL7+Kl/bGc/SttBxc08SpZ h7/o9lPSqXKwYUli8qlqVNZVoHAVv46kLb3mwML2p+auMPbdXay53NkrMebdzMBZoswYL0 BYYgUwcBuggVV/Pxv6N3mP5jFPm/RnCs/xxoVPEFw0owaY+Kdxk9wRCxjmbQTh0yffj2+Y HLse1vNz47Wq0PADJWzn8969vhH/EbRtPZz8E0AycXsEGHn62PgZ8QWuRq1T3onutoQQ7g nlxpZ+eMMVibxipyozFFijdOuZ5bPpkQp9q0Hov3Q342Oujj2HQsW5qiK3UPyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159353; a=rsa-sha256; cv=none; b=NbrhLIRVWlb/jdguZsN85hA5VaSvTrfi9yHcUltAl+pbEZvqR5Q2s7jk9jd723XqGPBC9A x+zzopHTQj8lIGI2P8Gd09MqyBeQbIO6bcILQO6U53m3lDMhPpBKBjg/sRSHdatNELK4U0 hiAAqcCeIlP2QgDJkr/zSpy9PKMRtTXf2uDYgkHbNHVhP8WgATK+YdjL90GSjasFIOpupE Yjddd/O6HR6SxaHqoh9ohr06VYTjK3JMVrNmKy37Ds9tcZzGvFe32iWzVv+oea13IV4U4G kk9tuGLE8qBihqHjqOkGGP02ADfv/ZE3tBnok2T6uium7ZztQPPve4/mKPFxJg== 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=1772159353; 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=rcs+Ddw4NLf9e1P9zfFSpg/If6e/dzANY2+kvFKdQa8=; b=Yw2p0gb/eXwv732pEH+eZ7I5trArRUkher5pDuTuTGgF8evtV28Rr3pjRcnXdrgR69I3iT +B3AwoGfiu/3U/QCQCHy5pFFMF9f21f5s4prf41ppc4GWoEMmS9dFislPjZeuv26NTQUw/ nWdwrpWtH18aiGC3f4b166SCMvYPl72v4XeCuRVpSrpSp7uM8YfDzdmvMdHC6r7tsoz7+A xmZR5xlaS3v+jj1j52iRiWtqnLS91L+CbXIJ5t8VkXIIAGbHHwXigLtft2yp7OR+Iczzw1 GuYkfSQ2ZkmuDzgHGzcpFx05mLez0rCk3M6RflQp1h0i/uK/G1/3qiTilfIW0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXMY3FFjzyZL for ; Fri, 27 Feb 2026 02:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21fac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:29:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: b24e74670c84 - stable/15 - net80211: correct return code for ieee80211_ampdu_request() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: b24e74670c84da9c00a999a8ceb1c5906262dec0 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:29:13 +0000 Message-Id: <69a10179.21fac.eb1b5ae@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b24e74670c84da9c00a999a8ceb1c5906262dec0 commit b24e74670c84da9c00a999a8ceb1c5906262dec0 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 13:48:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 22:57:10 +0000 net80211: correct return code for ieee80211_ampdu_request() We used to return the result of (*ic_send_action) directly but ieee80211_ampdu_request() returns 1 on success and 0 on error, which is contrary to the result of (*ic_send_action). Deal with that accordingly and update the documentation of the function. Sponsored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D54794 (cherry picked from commit c670af3725d0bb5494caf0846994ae6997175cb6) --- sys/net80211/ieee80211_ht.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index b22e0cf52a6c..b3c9532764d9 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -2766,10 +2766,15 @@ ieee80211_ampdu_enable(struct ieee80211_node *ni, return 1; } -/* - * Request A-MPDU tx aggregation. Setup local state and - * issue an ADDBA request. BA use will only happen after +/** + * @brief Request A-MPDU tx aggregation. + * + * Setup local state and issue an ADDBA request. BA use will only happen after * the other end replies with ADDBA response. + * + * @param ni ieee80211_node update + * @param tap tx_ampdu state + * @returns 1 on success and 0 on error */ int ieee80211_ampdu_request(struct ieee80211_node *ni, @@ -2777,7 +2782,7 @@ ieee80211_ampdu_request(struct ieee80211_node *ni, { struct ieee80211com *ic = ni->ni_ic; uint16_t args[5]; - int tid, dialogtoken; + int tid, dialogtoken, error; static int tokens = 0; /* XXX */ /* XXX locking */ @@ -2828,8 +2833,11 @@ ieee80211_ampdu_request(struct ieee80211_node *ni, args[4] = _IEEE80211_SHIFTMASK(tap->txa_start, IEEE80211_BASEQ_START) | _IEEE80211_SHIFTMASK(0, IEEE80211_BASEQ_FRAG) ; - return ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA, + + error = ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA, IEEE80211_ACTION_BA_ADDBA_REQUEST, args); + /* Silly return of 1 for success here. */ + return (error == 0); } /*