From nobody Wed Apr 22 21:08:42 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 4g1BfL6wk0z6bL3g for ; Wed, 22 Apr 2026 21:08:42 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g1BfL1ZhBz3lBr for ; Wed, 22 Apr 2026 21:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776892122; 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=ir2Awizul12VH9VCvxeViZ0BGN0eur0PnVIE/E3hpaM=; b=KfwuEH7ngGfSpvcZqZzGFnEXWRlkkO1UXwylURyvYpV5eebANqwPOJI6ZXwiZOwQokTzcm kmE2XmUV9Xnsy7Ie2bRFG36ijqigkIM9n8gvZNVy0urWarLHUC+cpkyWq9Cc+UyE2bQ76b XU7GhCV2wQT+fCz7jehZq0Ce4b3ysGL50/IH2BXPQ22wJTLjeFMF3WmEWVs/Rl1XxhOKxO geNY3oLjJuugXaiZVFBSgdCX86jMxe1BTm8wsVh/av7jILpyHN+y820EHR/aGia0bkH2MF lNSicJyiuQnQiYZW2wpqmfwRx/F2RAfYoZFAbUTrxRfWxKBzX1hqLDHvuw9TqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776892122; a=rsa-sha256; cv=none; b=ZHWyr/+LS4AtHiYK6N8AuKfB79rEZBRteYDcxWHQC9uV5LGsSsIJJRP0Sl0+4sb5OP72n4 w5WeuRomvFk0WNUIm9PfGYOuNpjicMq/3XHWAGfN+uAXhvVN83HVEOzTj08v00p8RpwNM8 OK6AL76wcrmvGg9GT1wUyO6IGUFScwlxC2CMika8gKTv9eYlQMaEawgF3GUF/uVvjpU+61 n6SdXv+gvWyuS1A9C42uIJzuAjaZt/BZWK4pI871RH6y1dDi8kaoWSBi4FaeDIsQ54UEsa NsQoKThSXWscENVJ/pjM+fOE3xUCEuFDedWAuBsDNZsCn/szF1Kw4K4kHGrYOQ== 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=1776892122; 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=ir2Awizul12VH9VCvxeViZ0BGN0eur0PnVIE/E3hpaM=; b=pF6cIlDMV5+PVyNuDs4v0kLhh+yjsfb6OtXo7Cu6ZPFkLYV2UKBIroO0+QXURZH4zSP8fj oUddjs4OR9kMNPJSpeTBuciLi3Rf7G9VoOR8LRhMF7votLX5I4CvTqS/5nzF2K8mmbiLJV 5V+jPhwx3hzOacJ9gVIEcZyB3bCYceFWCeTug7lyG7IfI6h9CzcuzZitRxR2QvGNNURqiR 28x/0jZjRPNcIngeMDHIJE0aeB8hLu5pr3QxoguT17RpL60X4HdCrc04YO70Ezt8Im/E0G HTh9n5jwAiyrEkjXV0jqW+ZPM05A3LMwsRSefAGWlBb/aEL0S98fg+N+q8qTHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1BfL18KhznZm for ; Wed, 22 Apr 2026 21:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27b48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 21:08:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 672ab3812bc6 - stable/15 - LinuxKPI: 802.11: save the default channel 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: 672ab3812bc66d4e8cc5f44f5444749bf20749df Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 21:08:42 +0000 Message-Id: <69e938da.27b48.197e50c4@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=672ab3812bc66d4e8cc5f44f5444749bf20749df commit 672ab3812bc66d4e8cc5f44f5444749bf20749df Author: Bjoern A. Zeeb AuthorDate: 2026-03-10 20:02:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-22 20:57:04 +0000 LinuxKPI: 802.11: save the default channel Add a field to struct lkpi_hw to save the default channel for later reuse. Sponsored by: The FreeBSD Foundation (cherry picked from commit ced6909dd69b8476121dc291e01fa56ae14520e5) --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 ++ sys/compat/linuxkpi/common/src/linux_80211.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 8bb5bd4201ef..92eccefca078 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3963,6 +3963,7 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], lvif->lvif_ifllevent = EVENTHANDLER_REGISTER(iflladdr_event, lkpi_vif_iflladdr, vif, EVENTHANDLER_PRI_ANY); vif->bss_conf.link_id = 0; /* Non-MLO operation. */ + vif->bss_conf.chanreq.oper.chan = lhw->dflt_chandef.chan; vif->bss_conf.chanreq.oper.width = NL80211_CHAN_WIDTH_20_NOHT; vif->bss_conf.use_short_preamble = false; /* vap->iv_flags IEEE80211_F_SHPREAMBLE */ vif->bss_conf.use_short_slot = false; /* vap->iv_flags IEEE80211_F_SHSLOT */ @@ -6832,6 +6833,7 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) (ic->ic_flags_ht & IEEE80211_FHT_HT) ? NL80211_CHAN_HT20 : #endif NL80211_CHAN_NO_HT); + lhw->dflt_chandef = hw->conf.chandef; break; } } diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index 8ae5c3d13d2d..a2945498e8df 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -254,6 +254,8 @@ struct lkpi_hw { /* name it mac80211_sc? */ unsigned int mc_flags; struct sx mc_sx; + struct cfg80211_chan_def dflt_chandef; + struct mtx txq_mtx; uint32_t txq_generation[IEEE80211_NUM_ACS]; spinlock_t txq_scheduled_lock[IEEE80211_NUM_ACS];