From nobody Sat Apr 18 01:12:42 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 4fyDJB52JFz6ZT7K for ; Sat, 18 Apr 2026 01:12: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 4fyDJB37FHz3nQt for ; Sat, 18 Apr 2026 01:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776474762; 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=gSIOXzlkJpMqHy6N65pBwth/hDv9KvD8qrl8+y3iG4A=; b=TeIr0KtD5AYVb6P5wTmDj8zVPMNpQOpN5KwNCRGfOGy6+/R8I15N4JirfmoQcGEYP3zAp1 CQSaW4yswTRDQMZtb5fJjwlOtdDm7jK9RhDjD2RBYe2XWOxws94Huy8cl+eAG8ws7bcFsG Sh6ZFmQBmrIwlI1XqM/SrP8TsKJktwXl6H5C/rd8NPHfg2UY4J8PODvDY55007WGNhQTSL HmpLNaEg39VXtCr+uVZ6RMs3HfoLv4GLpVqwJl2ismgzs+mZjHoT7pH4eRvdoXvUb/i5CQ HnAp1DDUxETw1+TiG700mm178bnQWrOZ9tMrJaZ1OCTT4/7XqNrZF9ecvc/fEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776474762; a=rsa-sha256; cv=none; b=hjUJC8y/1OqwDaxF6wX049F1YMu5RbySivgYdY9sNBNB6MVvDFPgmf04RjUr1hklBwV9MI hBZSojX9E87Vig+rcdo29OxvSfWD/DV9AxFMSDsn+VHjUh0WE3CuVmAGRGpd9Z2/SgbP7F f1fhWS7hdDrexR+FbUdTQKCKvWrH1jBxi2vbZhJ9NCyAcI1UwyiMXS68hGakLsBNsk3KVU 9MOSoP0GEsXe6DHAMmB6XZoSfQ3iQbtr+Wk/HS6pASoNQTRaxGZXCHzKIQ+ojhRfWAFkXm //qruV10PFUCuLInRfCdKWvtU1nc2ShsW+tXrzy+Y87OmWrn1FFiQDn+4mOr6w== 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=1776474762; 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=gSIOXzlkJpMqHy6N65pBwth/hDv9KvD8qrl8+y3iG4A=; b=TPFVeU9Y0OPwwr85xVyNY3WgknrN9znHnxbOT7me21mU/IkRBjKzQoQuuIm4ORvc9a6AuY P0bj1kF1SlKu6339znd7v1nGPOyiHiL7kq0VR/MwOfQN1Sj+Q6MYsREmfX5InXKJ/xC8i5 Nt6TlzR1J/csdQNmmRWiufiR4mxL54vAiWxMJh7paDj9Dmn1wR8FDhLnXZ7yYJAgJ3j+sG kqzlamd/0T0vAeF9XEmcIGYnn25CN8i4F0Bz8fpVcdP7WampEd84rOv0uakqQEKX7+oVdd +M1Xpt6GGd6UJkVz54vPnwOkAh1PurwBfZ1sjib64dk7R6JTpS6CoXNuUUHCLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyDJB2Vzzz32N for ; Sat, 18 Apr 2026 01:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4565e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 18 Apr 2026 01:12:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ced6909dd69b - main - LinuxKPI: 802.11: save the default channel 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/main X-Git-Reftype: branch X-Git-Commit: ced6909dd69b8476121dc291e01fa56ae14520e5 Auto-Submitted: auto-generated Date: Sat, 18 Apr 2026 01:12:42 +0000 Message-Id: <69e2da8a.4565e.5b581748@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ced6909dd69b8476121dc291e01fa56ae14520e5 commit ced6909dd69b8476121dc291e01fa56ae14520e5 Author: Bjoern A. Zeeb AuthorDate: 2026-03-10 20:02:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-18 01:12:08 +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 MFC after: 3 days --- 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];