From nobody Mon Mar 9 11:03:48 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 4fTvJh4vhTz6VZD4 for ; Mon, 09 Mar 2026 11:03:48 +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 4fTvJh0mz5z3lQC for ; Mon, 09 Mar 2026 11:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054228; 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=+B94TlW+iwcGoL9UXbbpCWPf1P62Kis0MXQryns/9RI=; b=ToFEFSfG5OX4tHjMWtHvBsMtAiW1n62kFlULfnpcd+UTmW2eSZmIvncs7OXrRGl7e2bKzt Utec+zwjch01MwnjaXNig+8S/zubq5C3BsamdSwHwYFxdPoETO50BINXGQmV2/nnHjVK5D 63mZUyD+XVSSDVjiSipM4Svik1NedSVvu5r+91l3n7yTb0SYGQO0FTgE6mxKbXOBpFiOFl ThoEwY17E4mDUaOXurHyI2z4eKVN+NFKU91FzrCNo4wuREARfBWRXm+LV5gwVfucJ/1bsQ pY7TbZhDlyKgY1ILYmKK8RSFZ6QnVt9CiMXpHp+adwniwyjQYX/Bi0DMoUr+og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054228; a=rsa-sha256; cv=none; b=hUPTKmNpGXkHT3mDY8dRM1Y8cJVzBGNc66KIfx5plDBek4sXGVPHPdkjwVA4qVErVQcUgb viIpWXkKZGevZwhf17TuM5TzknIm0rNAHLXOI8ESDawna61ArgKFGGtuM6lsWu6q6rSk40 y0qIK5MxmKMgM3SEBOy9nogS1LxVffWR4KUUqn6WmFoacz63bTbM6N2McdJfcD2LyDZSlx 2KOyDcM2aWRDQ2DqlRo9d8DFDsMSiCc8weY78o2UjSdul22R+99/jiqS1B65XCebMnO4+H 5hyQ1cuOgXRJOMs2QC6RGM6xpqTF7slKZpgoDNFioBmN3RKMr+mf6fofN+rWUQ== 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=1773054228; 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=+B94TlW+iwcGoL9UXbbpCWPf1P62Kis0MXQryns/9RI=; b=IY5UziSwxGG33nSmZTGAPCvYcjjD7Cb8KwEbhTJEn5Mwi5PpL5wwEGxV54yorrKtXoBIYo AQpSCoTQ28Cm/fejrRemJv43oXhuj7rfM3wVM7TIJlptxEID72IPjFZDgiITGFif7ZU8r0 DJDoFXt3llDvwv/vtKeBumsT1OVlXQ3V0wD10Wt/s+Mvh1xaaPrebUsRf2lGS661U8C/hj PjxOqBiX8Pd5h7Otik7xy8ZgQP+ycfnBvFi41tKNdICegSDCDzJtkgrRs600RdtrXDVQTV P9Y2W1hZtLXogyGVP85bDMEJQ2q0mIM1oXxRGSt33iWYYJDq7HzSLvtfau0cow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJh05Pqz6wF for ; Mon, 09 Mar 2026 11:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45b68 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d9f606424916 - stable/15 - iwlwifi: fixup link_id for certain cases 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: d9f60642491649b6a05d8478ff16c3252acd8993 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:48 +0000 Message-Id: <69aea914.45b68.2eb90a93@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d9f60642491649b6a05d8478ff16c3252acd8993 commit d9f60642491649b6a05d8478ff16c3252acd8993 Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 09:47:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:10 +0000 iwlwifi: fixup link_id for certain cases In iwl_mvm_mld_vif_cfg_changed_station() if we do not do MLO (which we do not do yet at all), dtim_period is not yet set but asssoc is (our common case) the link_id can become -1 as active_links is always 0 for the non-MLO case. This leads to logging of a WARN; Invalid link ID for session protection: 4294967295 Fixup the link_id if it is -1 to be 0. This is the deflink link_id so that should always be fine in this case. For Linux 7.0-rc2 that code is already gone so this is a local temporary stopgap measure for the mvm-mld devices (e.g., some AX210). Sponosred by: The FreeBSD Foundation (cherry picked from commit 760e0a18d3033152899fbd0e3f587dfe3c28d6bf) --- sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c b/sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c index bf24f8cb673e..8b88f211066d 100644 --- a/sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c +++ b/sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c @@ -838,6 +838,14 @@ static void iwl_mvm_mld_vif_cfg_changed_station(struct iwl_mvm *mvm, */ unsigned int link_id = ffs(vif->active_links) - 1; +#if defined(__FreeBSD__) + /* link_id is gone in Linux v7.0. + * For us it can become -1 if this is non-MLO + * and dtim_period is still 0. + */ + if (link_id == -1) + link_id = 0; +#endif /* If we're not restarting and still haven't * heard a beacon (dtim period unknown) then