From nobody Fri Feb 27 02:29:43 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 4fMXN749KBz6T7gC for ; Fri, 27 Feb 2026 02:29: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 4fMXN72Bjhz416B for ; Fri, 27 Feb 2026 02:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159383; 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=TaPFPqKq55M2/xoCdJawHijo1r6W1pFOVVlxHzJ4xSw=; b=m/7FuIQmMyw6fDngrRsFZWj4D1do1IWB/6et0Rbu2m9xvbk8vmfoG4T28TaYgZLLVBwOrZ 4VYBySF2VWoIRkXM3lCQ9zDj5njNY/RkN2ssbkmisS7NHkPCHZZ4pTCt2INXT6OVm3cKxF T4AIdZ2nxAXDGxfKtaUDiKfT5QJMLHT6gZLVFyloptFUEe5Azk8AebY3m7mKhbRynt1zWE 8IRcnrERjNEBiCUyh5n6pjFyEMg469QqetUgu9XczJ18YWpYgJ/0WeYZaeAXEE3/bW7muj xhZnq5CrpGNOal+L0ATVyUhaMpbFN4i7cAN/mHLkTJMne/06MB7UT3n8FerIKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159383; a=rsa-sha256; cv=none; b=fd+HUgiGTW3ZlH/dhxqrnfQjmCLPGJUyThjczmmugdgB0h6lRuTd3clLsgfNf6wf0SX86a 2QLUEDC1AH39lpmYSrpjo22MpW7rLVfyuZHexHKzDiBdqd40xO89uj6wJX1ROlPOUPwHxS ekRWqlF442rspinJGhBaQHjNvdEBM3pQ5k6dn9HjqPueLwNMTlPTf+rkmVJjw3F9HRr9oA IXAOVB7P9PaLlNd05asWGoU8Ypyc3whCDjsaymJJeyckYkPus7mnROuoH7HTgj5xWOSRMX vkp/Jg94dU85Y80XJXFHS8pVdmYjy3CQzSEcMpWZQvMSr9OSbdbF3oMIA6tnJg== 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=1772159383; 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=TaPFPqKq55M2/xoCdJawHijo1r6W1pFOVVlxHzJ4xSw=; b=JPSMM3cazqhzj0RZRqQ9OT3o1lfjZfsZpPmA/C95OSp7NF46AUilU4NsRiqtADPXttY0TG uzB1Lk0tyW5hmk2aK2s+oT1WYL2OYa2iRWYOrrkNyppBz3W5oLWHr6Oxy3kdRy16LbmjPL 0QceBVUvIYhzhmacMpByEs1WM3b+gimobcKfkfDRX7nbdXAeyGpsJvKGJAoGBTRyW5h2Oz hHzro+w8V6JbafRzAXuwdga13n9vH0lJ5xPd2Zi/p58PTyvNWLwroChT3Qk5ld5z0s30XP e4dmlkTHYyA/Ru5Tl+hjquhYPenKNnBcxD1c7/DI/CV6IYrZX1qZYHgRzOykag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXN71hZXzxR5 for ; Fri, 27 Feb 2026 02:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 204cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:29: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: d5f1a9f574f9 - stable/15 - LinuxKPI: 802.11: make sure we are scheduled before wake_tx_queue() 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: d5f1a9f574f9144c86450440ff495e471735ae26 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:29:43 +0000 Message-Id: <69a10197.204cb.1905cf86@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d5f1a9f574f9144c86450440ff495e471735ae26 commit d5f1a9f574f9144c86450440ff495e471735ae26 Author: Bjoern A. Zeeb AuthorDate: 2026-02-04 22:39:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 23:01:45 +0000 LinuxKPI: 802.11: make sure we are scheduled before wake_tx_queue() If we are not scheduled before calling wake_tx_queue() packets may never go out, which at first will look like EAPOL fails (as wpa_supplicant suggest possibly with a wrong key). Using monitor mode it will be clear what is going on. Pass a flag down to wake_tx_queue() to call ieee80211_schedule_txq() in case (*wake_tx_queue)() is supported or not, which solves the problem for the lkpi_80211_txq_tx_one() which was failing. Sponsored by: The FreeBSD Foundation (cherry picked from commit 7d60647a1a6c19e7be33428c33b77faadfe863a1) --- sys/compat/linuxkpi/common/src/linux_80211.c | 8 ++++---- sys/compat/linuxkpi/common/src/linux_80211.h | 5 +++-- sys/compat/linuxkpi/common/src/linux_80211_macops.c | 10 ++++++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 2a56d19adbea..54571b28e2b8 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2025 The FreeBSD Foundation + * Copyright (c) 2020-2026 The FreeBSD Foundation * Copyright (c) 2020-2025 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from @@ -2150,7 +2150,7 @@ lkpi_wake_tx_queues(struct ieee80211_hw *hw, struct ieee80211_sta *sta, if (no_emptyq && ltxq_empty) continue; - lkpi_80211_mo_wake_tx_queue(hw, sta->txq[tid]); + lkpi_80211_mo_wake_tx_queue(hw, sta->txq[tid], false); } } @@ -5764,7 +5764,7 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) #endif LKPI_80211_LTXQ_UNLOCK(ltxq); wiphy_lock(hw->wiphy); - lkpi_80211_mo_wake_tx_queue(hw, <xq->txq); + lkpi_80211_mo_wake_tx_queue(hw, <xq->txq, true); wiphy_unlock(hw->wiphy); return; @@ -8751,7 +8751,7 @@ lkpi_ieee80211_wake_queues(struct ieee80211_hw *hw, int hwq) ltxq->stopped = false; if (!skb_queue_empty(<xq->skbq)) - lkpi_80211_mo_wake_tx_queue(hw, sta->txq[tid]); + lkpi_80211_mo_wake_tx_queue(hw, sta->txq[tid], false); } } rcu_read_unlock(); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index d4f18fcafbba..3d25ab4a857b 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2023 The FreeBSD Foundation + * Copyright (c) 2020-2026 The FreeBSD Foundation * Copyright (c) 2020-2021 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from @@ -481,7 +481,8 @@ void lkpi_80211_mo_mgd_complete_tx(struct ieee80211_hw *, struct ieee80211_vif * struct ieee80211_prep_tx_info *); void lkpi_80211_mo_tx(struct ieee80211_hw *, struct ieee80211_tx_control *, struct sk_buff *); -void lkpi_80211_mo_wake_tx_queue(struct ieee80211_hw *, struct ieee80211_txq *); +void lkpi_80211_mo_wake_tx_queue(struct ieee80211_hw *, struct ieee80211_txq *, + bool); void lkpi_80211_mo_sync_rx_queues(struct ieee80211_hw *); void lkpi_80211_mo_sta_pre_rcu_remove(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *); diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index a85e6d0d0dd7..634cffddea9e 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2021-2022 The FreeBSD Foundation + * Copyright (c) 2021-2026 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -644,11 +644,17 @@ lkpi_80211_mo_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *txctrl, } void -lkpi_80211_mo_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq) +lkpi_80211_mo_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq, + bool schedule) { struct lkpi_hw *lhw; lhw = HW_TO_LHW(hw); + + /* Do the schedule before the check for wake_tx_queue supported! */ + if (schedule) + ieee80211_schedule_txq(hw, txq); + if (lhw->ops->wake_tx_queue == NULL) return;