From nobody Tue Jan 20 15:48:38 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 4dwWvV6tKMz6Pk2n for ; Tue, 20 Jan 2026 15:48:38 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwWvV6D8wz3DMb for ; Tue, 20 Jan 2026 15:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768924118; 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=7FitRjs7rgvI6G1tDNr4KJgbyjM2td3+ETsa9MNjREQ=; b=ix85Jxh3W95mQLtsQut92lv0WgdZF+1wfbfxBA1ZCOGuidPC/l8Qt1c0MDnxft6BAiR/Al 8pZSnRERwDvuhGzRa15RysGRU58k2Kubn9vSNn6Vjo9mtx5hYzJyDKGcYZz+ug8zSqogQ9 ccSmeZWrJ2gKY31QOW5Zag6+j8FJY8QQFJ0zMNhbDOPVtmWiwvjJtnQfoARyajrdKMyiM/ uf/f4sgtZWiT3sp9alh7CLPeztZosfpkwq7nMmW9hge2rc6VSLd+GKIPfrYyaNgQceYoSM LXiRgUxzbF6jYLCi8uovI064qi/bMOtjcyR7mMJxFX28IZakQXzx5Qk9XWnoOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768924118; 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=7FitRjs7rgvI6G1tDNr4KJgbyjM2td3+ETsa9MNjREQ=; b=SRZ35z/5RmY9Rah7Is5mNUPoGS7INOm3y/niZZMxLRk/5zAd9LKfG1oGm/l7fPhGcw03eQ Zo0RM1/DYsEkdgbjqE6H6/7MxS+p76NliDcZIQz+Wzbh2+YPuCuwojstx9ylsFXiPIDRL7 mq99Ss2aQVYRiEXDDwSToeNtVUe6UirZWP1nuM6X2+6RMqEJOM8WiJYEHYvBJ6Ox2rIPcS VfFpZ2DNbnLeGy+Rs37WJdkWq9cvGsfs4g6woyGHnlHuyjAW5sTZjai8YNh2av1gDZZuI8 0rMQhJQsFYgVAwcbr2xfsY1laUqh+PB1vcxAEe6GWkZ/+uGxJBMA19+x3zPavw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768924118; a=rsa-sha256; cv=none; b=lfWLxdlrpyV2qThh26/Fir5RlGVV+f+1VLJJrD//Gjeufxhk/UOoAqCq2KgvCHZ60srzAd jUYTaCG8E/viDvkXVDLmblI3CkTOcv3FaTp47RuCNALr+UmPBuplkh/iJ2RwkEHIi8TzqO 1g4q6zE7DgAD3IDYKbUo7lKhlfDrd716ckfmg0gvDEUpwe9HKWYj5L0BOBKUBLLRNwAmMS u9fZC40YtpgBiy/HAVBAPkjBQMdybLiB6z/yXDkFAlFg+ea9qgqhcYeCRmhuLooRVM/1F5 TCOfB9RrEWRlC0B+UGZV6Q6EXskRe0wYuggQ5dYHh/urCr/Ncn2Mi7CqnQra0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwWvV5YhLz1Mjf for ; Tue, 20 Jan 2026 15:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25a08 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 15:48:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c670af3725d0 - main - net80211: correct return code for ieee80211_ampdu_request() 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/main X-Git-Reftype: branch X-Git-Commit: c670af3725d0bb5494caf0846994ae6997175cb6 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 15:48:38 +0000 Message-Id: <696fa3d6.25a08.564dd35e@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c670af3725d0bb5494caf0846994ae6997175cb6 commit c670af3725d0bb5494caf0846994ae6997175cb6 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 13:48:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-20 15:45:58 +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 MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D54794 --- 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 a8a767785fce..88e614e266a1 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); } /*