From nobody Mon Jul 27 00:10:33 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 4h7fBL1wGKz6m9GK for ; Mon, 27 Jul 2026 00:10:34 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h7fBL0XY6z43c1 for ; Mon, 27 Jul 2026 00:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785111034; 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=ccSoKwFGQEBTcOtyMcdSznzry0u6ND+onPEAzy9u6pc=; b=iMTGLcXgCEGCENnqZpO9UcnpmcP07gP3+ZzUqpWnfTum5o+yUQSdQ3LwsmZOqW5SZ/K/NM Xh+KvEv3I46tGc7x2kR0iYb3ZzHF8MTQSJgx4UErzYwt4BeCBq27PUIB9CYSjLj8MvTvb4 dw7hoBJcO7bhA/Q/cafJiT5F+F8x8yz7m1/5sxcMiMHzvZJktEfuwhdE+iaw3bVO0YBAA0 amCgPERel6u/zEOXnfMNiapSWsXR7LXySrIhIeB7jI9njTC85y5FLsksXHa8h3T6nKvgFC zYMwZnOcnOF4wiO1N0sHxZLrIltVBllJHocE4UvXGXLj0YEZOizAXMsAKbTMvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785111034; a=rsa-sha256; cv=none; b=tsNuWvCjm4bilXSpcswthtvpPIuYVq/+7kNGlzshm7sYcbQkmO32DOVCIM9LoQTFLKOpBX FAPl9Qp5jJZQY96oYatm8Q7IcAw16GEEEs4LbvUEaQpwzc31txWNtJbbqkn/o96c/kJ76y UIvfPNfhSqBssqQgo1htGZhzz0QaevZdGEprFfmLiMMoeV4WSX0MQf+4Zov2bTPabz19L9 45yX1lxhw3UrFfSGp5wtTCwVuDFYqSx21EIoFzbmTsQvFGEVu2Yi7rUfqbeuiPUsXLvyF0 fwfRD2zmUpjeV/GeD7mxFzk9lQc1jPFphTXWXwywTcrqv9xgmprxoeWynuAiIQ== 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=1785111034; 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=ccSoKwFGQEBTcOtyMcdSznzry0u6ND+onPEAzy9u6pc=; b=CfeNLZcFdzSHyY9kKtbytxaXNMpc8fr8tPesUuS7t3jQM1GeZ7iw+JVcOKYSBCEHGch2ZT PsEfG3LFLoOkmkwkARsEYXt36P1kX28Gb+Nkc8/0pmP3copuSihdfuB/0Jx+9e0ZIHwheY i4MYoR7feKtXHgIafPpq3Edo7lTVtZcHCmOlCTdnzOtdLXbFypQ9ugLfu7tSylagSOmQZp +cwdsUT6eE/NOy5KCmFk5JdU0dqLzqDfnjRV5FkJn1RrsYB63R32imKanPqzn9qoCbmbOB 2YQdfFgwcc4HwYOf0rULfI5ySoaFKCWpmbHU9ZTgy4j6ywl60tPcEu9DsRqMRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h7fBK5ZLTzlX6 for ; Mon, 27 Jul 2026 00:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27844 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 00:10:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: dada5634d4d2 - stable/15 - LinuxKPI: 802.11: lkpi_80211_txq_tx_one() only pass sta if added to drv 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: dada5634d4d2b02fd0f171cb3df93719ec94fda5 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 00:10:33 +0000 Message-Id: <6a66a1f9.27844.5690e14a@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=dada5634d4d2b02fd0f171cb3df93719ec94fda5 commit dada5634d4d2b02fd0f171cb3df93719ec94fda5 Author: Bjoern A. Zeeb AuthorDate: 2026-07-11 13:35:31 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-07-26 16:47:54 +0000 LinuxKPI: 802.11: lkpi_80211_txq_tx_one() only pass sta if added to drv If we are doing a direct (*tx) downcall, only pass sta as meta data if it was added to the driver (via the state machine). This prevents us passing a sta not known to the driver leading to possible follow-up complications/errors. This will usually happen if (a) we are doing software scanning, or (b) if net80211 decides to change the ni from under us and sends a packet with the new ni. Adjust a debug statement before to also have the added_to_drv field in it to ease debugging. Sponsored by: The FreeBSD Foundation (cherry picked from commit c6e70c68d2ce5cfbcace251ef6ed2f1eae912a74) --- sys/compat/linuxkpi/common/src/linux_80211.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 5a2355ca5f97..e550e85a5ab9 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -6218,13 +6218,14 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) ops_tx: #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE_TX) - printf("%s:%d mo_tx :: lsta %p sta %p ni %p %6D skb %p " - "TX ac %d prio %u qmap %u\n", - __func__, __LINE__, lsta, sta, ni, ni->ni_macaddr, ":", - skb, ac, skb->priority, skb->qmap); + printf("%s:%d mo_tx :: lsta %p { added_to_drv %d } sta %p " + "ni %p %6D skb %p TX ac %d prio %u qmap %u\n", + __func__, __LINE__, lsta, lsta->added_to_drv, sta, + ni, ni->ni_macaddr, ":", skb, ac, skb->priority, skb->qmap); #endif memset(&control, 0, sizeof(control)); - control.sta = sta; + if (lsta->added_to_drv) + control.sta = sta; wiphy_lock(hw->wiphy); lkpi_80211_mo_tx(hw, &control, skb); lsta->frms_tx++;