From nobody Mon Mar 09 11:03:43 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 4fTvJb69y1z6VZfJ for ; Mon, 09 Mar 2026 11:03:43 +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 4fTvJb53PKz3lPc for ; Mon, 09 Mar 2026 11:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054223; 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=vpKKkW0+b5Ridfu2oTa4+G5R+HRvPtoP0P9CMeAUYa4=; b=GlEiwHgOkP4w3dAMjNMA1NPQLt63i68Uh+qeHLVdkeKcDtEddb3zJlXBv2b0719TCCkkEP W4dCxm3M9Gmqfkgt47JlE7FLpQKMia1vRCxyLgEF3SC93/w8cHAxIOpNqc6/ztVBERHzer tVXgnoHmm1r4W3RO2p+RhAq0LmKbr4X8/eQxziVTal5ofXZhFGv+eKOqrPkdf9Bc37SgK+ MCAlcmx8sSOrlJjrywfk5QDasVLZhzKXSoPYFoHtfVCuWig0r1Ls1aHjKSxnQvW+vyiXCA SCIubv4CcKhFD1pRirBkcuVDaeFACHFo+YdvF6W43j1Kx15dJG07vRx1a0VBfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054223; a=rsa-sha256; cv=none; b=LOYVVzvbUZ/HCphOCJQk7xLbOJbufaUOb/6/ku6SKICdA0Od0/6zBfv4NrnKboLKQfmPHq 7tIRiUAPndg2tm5Tmva/s325r+vbKnpRAdCQFpo9CckfIjhCtEAWSoE6VT0OoU7JN0uz9C 3zzuev9qH2bpxZXAbF1W5X6KHUONjZnfpq0LtI9hmp06ndG6cxJp4WmQOfgAJLkSRyh5Ep /+waRoL5wuGExUNsQq/Asp0WuRg9p1IP4Dz0uWF9/7qqGj9tFcWnl2qkf6xNCzs4fboMf5 1VmOv9CgN4m2DiDhfm16Jm0YCtM+14b9jn5ldebs2CYsNvdGicXpR3z9oom2PA== 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=1773054223; 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=vpKKkW0+b5Ridfu2oTa4+G5R+HRvPtoP0P9CMeAUYa4=; b=fEuwwKyqYEYIgEZKVwsfzzapdqVRkiCNT1eDScOB7ChiUXtuMNwDQO8wH2fCu7PXEtOcEF aJ0K/wUQXC1qpBbaTlHuowjDXX0wZcTBcdUI91w4WYj7aJQkCezN/USWRsIma9fs3EBiHG GL0QmoHJ21L2vFbajKcaUZf88F5CavC5Vr3Y4xkfQoPo94iz8AWLhraPfOZYr/8nmclxpX u5DLFQpM7tZ+b39Aq6w3tqPg9iZYyagkRIvN0vQfExaP3qMiyxohXY8jOwPDobx5JpP/fn /eltzfY+TfdhQEygAobzMP+xHeWXKZ5W4xdT3mvrq3I1NHrp9GTu4i1HzKmFjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJb4S0yz79Q for ; Mon, 09 Mar 2026 11:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47964 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ca69d10943b2 - stable/15 - LinuxKPI: 802.11: move linuxkpi_ieee80211_handle_wake_tx_queue() 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: ca69d10943b2eeaa551514bd77d410d470edf225 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:43 +0000 Message-Id: <69aea90f.47964.591c0b91@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ca69d10943b2eeaa551514bd77d410d470edf225 commit ca69d10943b2eeaa551514bd77d410d470edf225 Author: Bjoern A. Zeeb AuthorDate: 2026-03-04 08:11:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:09 +0000 LinuxKPI: 802.11: move linuxkpi_ieee80211_handle_wake_tx_queue() No functional changes. Just moved the function within the file. Sponsored by: The FreeBSD Foundation (cherry picked from commit 3d3303b756ad4ee3ae520f6d07df6978d049a871) --- sys/compat/linuxkpi/common/src/linux_80211.c | 76 ++++++++++++++-------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 20ab5a641415..7b61ff6603b7 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -8574,6 +8574,43 @@ linuxkpi_ieee80211_wake_queue(struct ieee80211_hw *hw, int qnum) spin_unlock_irqrestore(&lhw->txq_lock, flags); } +void +linuxkpi_ieee80211_handle_wake_tx_queue(struct ieee80211_hw *hw, + struct ieee80211_txq *txq) +{ + struct lkpi_hw *lhw; + + lhw = HW_TO_LHW(hw); + + LKPI_80211_LHW_TXQ_LOCK(lhw); + ieee80211_txq_schedule_start(hw, txq->ac); + do { + struct lkpi_txq *ltxq; + struct ieee80211_txq *ntxq; + struct ieee80211_tx_control control; + struct sk_buff *skb; + + ntxq = ieee80211_next_txq(hw, txq->ac); + if (ntxq == NULL) + break; + ltxq = TXQ_TO_LTXQ(ntxq); + + memset(&control, 0, sizeof(control)); + control.sta = ntxq->sta; + do { + skb = linuxkpi_ieee80211_tx_dequeue(hw, ntxq); + if (skb == NULL) + break; + ltxq->frms_tx++; + lkpi_80211_mo_tx(hw, &control, skb); + } while(1); + + ieee80211_return_txq(hw, ntxq, false); + } while (1); + ieee80211_txq_schedule_end(hw, txq->ac); + LKPI_80211_LHW_TXQ_UNLOCK(lhw); +} + /* -------------------------------------------------------------------------- */ /* This is just hardware queues. */ @@ -8675,45 +8712,6 @@ out: /* -------------------------------------------------------------------------- */ -void -linuxkpi_ieee80211_handle_wake_tx_queue(struct ieee80211_hw *hw, - struct ieee80211_txq *txq) -{ - struct lkpi_hw *lhw; - - lhw = HW_TO_LHW(hw); - - LKPI_80211_LHW_TXQ_LOCK(lhw); - ieee80211_txq_schedule_start(hw, txq->ac); - do { - struct lkpi_txq *ltxq; - struct ieee80211_txq *ntxq; - struct ieee80211_tx_control control; - struct sk_buff *skb; - - ntxq = ieee80211_next_txq(hw, txq->ac); - if (ntxq == NULL) - break; - ltxq = TXQ_TO_LTXQ(ntxq); - - memset(&control, 0, sizeof(control)); - control.sta = ntxq->sta; - do { - skb = linuxkpi_ieee80211_tx_dequeue(hw, ntxq); - if (skb == NULL) - break; - ltxq->frms_tx++; - lkpi_80211_mo_tx(hw, &control, skb); - } while(1); - - ieee80211_return_txq(hw, ntxq, false); - } while (1); - ieee80211_txq_schedule_end(hw, txq->ac); - LKPI_80211_LHW_TXQ_UNLOCK(lhw); -} - -/* -------------------------------------------------------------------------- */ - struct lkpi_cfg80211_bss { u_int refcnt; struct cfg80211_bss bss;