From nobody Mon Jul 13 14:59:22 2026 X-Original-To: dev-commits-src-main@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 4gzQZM1Ss1z6lMDF for ; Mon, 13 Jul 2026 14:59:23 +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 4gzQZL61Ncz3qCq for ; Mon, 13 Jul 2026 14:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783954762; 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=PBpuakglHhhSrwsWtoVhFH7qoCcghxp6wFnhJ6PgsD4=; b=N39vJ9xzwOBMWYiyDRbyrSLiOP1/GShaizp8wNvIadjXLEDIT3DOVzz1byr8noG7T4QOAR DAXP7wkbde+1aml0cOTrdit8JA3jWkfohdLRGhqR2X08R8MDyn5za7J8fzrRfAKlX80KGo zssCP0enHw6GkfYdUALz0Kr34Ik8jZlIXxf7D21DwNLhxTrzh7mtuW7nnW0Iicmm1scicN PlpeVeh9SC9E/3otDcl7rNUoK7EYJDu3u99ulEuEQSsgJ407h4ueOL34CMr7CDWCE2QdDm /Fl2Hy9KKKLeEP2D6/xDOvBSskCog5kOE1RoFGptOPJh+RJIHNUKZENSQKcz3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783954762; a=rsa-sha256; cv=none; b=GseAEQz4QHthxGlcrwAZaUmoFS36hh+RULbmLWkkvZ4DGpgR50lVRi65oMwgSNKiw5Qit4 ao54HZkcXTZN3CC3U5+ahAFOfNYfLC9kf4QyyH7f/5pdr2XLeSrKLF/ntwaDycKBICQTE6 /xKe3s3eXVMXX0P6CNKSSfDln6KtZeUFLGE0lWaem/4Z4Ll3MBf5lNP3b1lcclI2QgjKAj ocmcgz3uvGNGiAtSiRZEl6YcANQ7KJ8lk50p32OZiI7KlOtE4paeurdDW5Bkk8aNbiDBxX mQkg6fEjRQZyX2muCy2k+U8tFYbIMp7Z360IndriEZCePIVxLsGyCkZrHWjSWQ== 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=1783954762; 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=PBpuakglHhhSrwsWtoVhFH7qoCcghxp6wFnhJ6PgsD4=; b=NMhESnhKIrvHA8nCWlnH4HvBg7orOwGUFB86lYpTgkBhZhb1Vdg1zo3jDGOwtsaOYsr+qi bduXc7nxuJGXtPHw/KlA0xl3Tc7N3fCSmwIm32gbN5YI3YnGqX0ZbHk3lTwcaOaLgWct2p VS2LGJgdd2IKGk+/rCKftNr5gqhKAy6k/UPACSGXYA4y/v9R4fSqhBIio2eO3LhJ9qB0Vp ouwg3co2eyVyPKgsiUSMYTefYT1NAvzMLqzrByU9Ib0T/Z0BO7BucKf32lxucxhB2xBe8K 4vNN83EMNauLb9PlJ41RmMH0mUiRbX/OP5BDm0Pwcefsuoub7UpnTxNE+v5HVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gzQZL4j9Mz13Vw for ; Mon, 13 Jul 2026 14:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d78d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Jul 2026 14:59:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c6e70c68d2ce - main - LinuxKPI: 802.11: lkpi_80211_txq_tx_one() only pass sta if added to drv List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c6e70c68d2ce5cfbcace251ef6ed2f1eae912a74 Auto-Submitted: auto-generated Date: Mon, 13 Jul 2026 14:59:22 +0000 Message-Id: <6a54fd4a.3d78d.2b0d0a76@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c6e70c68d2ce5cfbcace251ef6ed2f1eae912a74 commit c6e70c68d2ce5cfbcace251ef6ed2f1eae912a74 Author: Bjoern A. Zeeb AuthorDate: 2026-07-11 13:35:31 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-07-13 14:58:24 +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 MFC after: 3 days --- 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 2e7ce4d4148f..ffce2fe48e10 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -6224,13 +6224,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++;