From nobody Fri Jan 16 19:40:33 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 4dt9Dy0kppz6NlLZ for ; Fri, 16 Jan 2026 19:40: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dt9Dx2NTGz3wrH for ; Fri, 16 Jan 2026 19:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592433; 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=zQfmK0SiXObyAG7A9w7eLrh5AIzzw8cKh/HoBsMfYAs=; b=A4Bg1L0f60RUBq7Pt7Uvfj0d3HtwZUE+YiZ5qXI494m7f+xNHUJuZTjPUAt6oPgs6rB2v+ V7kDeE4cRXzZYHFJ2NyupP1hDdwXZwA5kUrMUsZPgoGepfhOwhKFlkG6ymMIMHk6dUVvto s8hNAX7qyYUjJsIW7C0ovp/uLSNcS5pRim3Ysm5A0As45/BNsx1xy45/9lhaYtoJ6Zsfx1 d/6thbSxhmgLG+S1sT+RJ4KVxIKvJBd4KvVp98ZlNwmtk+dEpLSbcwennY+EvgTPfS6tuv TLmZ1VlR3ebFMagmh94UOFbp84Zet3uLKJ7YAltsTHcCURQutJheXse97qFFzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592433; 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=zQfmK0SiXObyAG7A9w7eLrh5AIzzw8cKh/HoBsMfYAs=; b=huJ9lO9evD2uAbh3HFU0vq0xzJNLx/BTCoKC5IZO+sKh4JJhC/EfD2u+BR5Ic/PA8yfi8F G0tx4iVRhDoGtkk+9ga0p9QVDZILnKpd07uyfsKCSetrusz+G1pIRT0zv8FJf7MpQ6Hxuc EG2YCLoaSJwkJHEPh7L2+VwunTcf7NnwmV4ND/ZAMX6JWNt2xqpuQ10qI/4y9kPCEUiGq7 4aAWC2sRrpfiKLdZ2fBphE8EanN0n3FUFqYCqdjWW8fEZDAt/SFysycHrG1QJFgjHe477+ 89DyrDRLeEPBfbeySTicAzw5hXr3GX2BavwC/Z5whx4NO0Y7Qo+GTYW1YIAHUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768592433; a=rsa-sha256; cv=none; b=v3P2vQ0XlHBkgfoaeCt3Z+7VVL4oSn/dVt4mX4LroG08oaQvmOl0BbBlPhH+lyYS1UY+qQ 3+qnF/nUnZa7grwYTyO51e9c7gwHkdRuSsouGCFewntUxgqbPlpzVuoFFrszwh23/OdN5D m2mlhxbzbGx551cAXtIb9STmdvesBoWaIlmALjNbe2iz0TnHIkaF6GJ/TqKytbzVWGK7eD QINaZDru3GRb4W/29jUE/DpxDBxdH77XcGoONqSuEpIMNyJdb2364uGXA4oabvPRMgxKEJ e6A+OKLg43VZ0ZRzKkYjZGmuRw+niyJiD6W11AvSA8AeBSk9Sgruuc3/dtWa6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dt9Dx1GxMzC49 for ; Fri, 16 Jan 2026 19:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id da1f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 19:40: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: 11f0a07f37c4 - stable/14 - LinuxKPi: 802.11: adjust linuxkpi_set_ieee80211_dev() to set ic_name 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/14 X-Git-Reftype: branch X-Git-Commit: 11f0a07f37c49e7c9bce020a2996c92a5466bb46 Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 19:40:33 +0000 Message-Id: <696a9431.da1f.1f42ab4@gitrepo.freebsd.org> The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=11f0a07f37c49e7c9bce020a2996c92a5466bb46 commit 11f0a07f37c49e7c9bce020a2996c92a5466bb46 Author: Bjoern A. Zeeb AuthorDate: 2025-07-07 07:02:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-16 19:37:43 +0000 LinuxKPi: 802.11: adjust linuxkpi_set_ieee80211_dev() to set ic_name While we used to pass in the dev_name(), we now use wiphy_dev() inside the implementation to get the dev and the name. This is for two reasons: (1) ath1xk also unset the dev and we need to check once we add support, and (2) in preparation for future work, which needs to hook into that point. Sponsored by: The FreeBSD Foundation (cherry picked from commit 60307068cf64700f5379c782ad98336d4d0f7390) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 4 ++-- sys/compat/linuxkpi/common/src/linux_80211.c | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 2ed595095f9e..c667ddea1085 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1135,7 +1135,7 @@ extern const struct cfg80211_ops linuxkpi_mac80211cfgops; struct ieee80211_hw *linuxkpi_ieee80211_alloc_hw(size_t, const struct ieee80211_ops *); void linuxkpi_ieee80211_iffree(struct ieee80211_hw *); -void linuxkpi_set_ieee80211_dev(struct ieee80211_hw *, char *); +void linuxkpi_set_ieee80211_dev(struct ieee80211_hw *); int linuxkpi_ieee80211_ifattach(struct ieee80211_hw *); void linuxkpi_ieee80211_ifdetach(struct ieee80211_hw *); void linuxkpi_ieee80211_unregister_hw(struct ieee80211_hw *); @@ -1255,7 +1255,7 @@ SET_IEEE80211_DEV(struct ieee80211_hw *hw, struct device *dev) { set_wiphy_dev(hw->wiphy, dev); - linuxkpi_set_ieee80211_dev(hw, dev_name(dev)); + linuxkpi_set_ieee80211_dev(hw); IMPROVE(); } diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 464650c4fd3b..6ad53eb81bff 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -6048,17 +6048,30 @@ linuxkpi_ieee80211_iffree(struct ieee80211_hw *hw) } void -linuxkpi_set_ieee80211_dev(struct ieee80211_hw *hw, char *name) +linuxkpi_set_ieee80211_dev(struct ieee80211_hw *hw) { struct lkpi_hw *lhw; struct ieee80211com *ic; + struct device *dev; lhw = HW_TO_LHW(hw); ic = lhw->ic; - /* Now set a proper name before ieee80211_ifattach(). */ + /* Save the backpointer from net80211 to LinuxKPI. */ ic->ic_softc = lhw; - ic->ic_name = name; + + /* + * Set a proper name before ieee80211_ifattach() if dev is set. + * ath1xk also unset the dev so we need to check. + */ + dev = wiphy_dev(hw->wiphy); + if (dev != NULL) { + ic->ic_name = dev_name(dev); + } else { + TODO("adjust arguments to still have the old dev or go through " + "the hoops of getting the bsddev from hw and detach; " + "or do in XXX; check ath1kx drivers"); + } /* XXX-BZ do we also need to set wiphy name? */ }