From nobody Fri Apr 18 14:37:13 2025 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 4ZfHQy1cCrz5stJ1; Fri, 18 Apr 2025 14:37:14 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZfHQx5lQwz3KpJ; Fri, 18 Apr 2025 14:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744987033; 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=Y4EukVIykvAOVAvSMvO/tQUzXrKpQh8dS0fuPIBCwPg=; b=U/mQAUEpKyurulfVtnXhh1YbMq+QMHackfRUXfnYN4CnxLFTrFV96SMkjEqzglEPRGl+48 2uCxEB509J2TQ/kSzldEqnj1jIrVnsX7TgdSLtTN8N7KJvJh80dfktalbHkgPNZlrLbcfu RVi0byA+ixpn8Uti5eUYqkMbyzYhJEoy/0NcEsrujTmr6p992i7lZhSzbtKOfPnFtU6f4D 1re5fxBM+Ocd4wKQTNTTdwSGmYQA6fIZFS3klH3FRNOQX9PIcoOo7RcUE0z4vWEIPh2E+z 67RuZaBV9YHRtmjJovG5ckRR4hji0p4fiEiZU611t/6Z3qNyRsIFezVO6Libzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744987033; a=rsa-sha256; cv=none; b=uJPHq61XOxug3udDaKcpYeHMVZqo3LKhctSQ9/+f7yvtGe05tIQ0glF5yZfv+VV9KzFpge lYItmVOn4ubFsqgpeLho1fj9AGgoA1J4RDtpnxqxldmwBdQ0j0xpsqcXkZywpo+hfIGNZ0 R4QKfAGg/H2H0WuH6WbK+8OR1/YJ6aEKJtYWLdSSUQVVrSSabOnK4qIpRSUR075WMSqcce jcTjIDTNIG3MpzpWX4zMP4Yi47gO503gZj/fl6zACSRIU6ndviBIL+mTGzKg9KLSsismle nyFFMN2im62Ipg8uy+uY3zGC0lYCDxE2wTyBcCIvCaxPIwrSLLsGMcKcQtQvSg== 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=1744987033; 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=Y4EukVIykvAOVAvSMvO/tQUzXrKpQh8dS0fuPIBCwPg=; b=m4VIi71ZhoEbEdDXgOmBKs6OFiWnKLecrC54aExyNeBMF5nnlBw0C3OAgqWnam8cr0R13Q 8VdNc1+S1XUgxugIVWhYgvZfHAil9aAyR8kwFKlfkxtL9ihI6JDozYEPQRfw5JqQIfxPh5 nR8qTzZc9vSc9wJ888QjxpIulPKkJx6o25V5YRLQAPK6vLoW1uDJ0uwUpLKZ1NG7Jqyarf rjlVoj5JET9aLMiTMcrHAIhKceDQUQ5f3oK5vSQfqT7Bcgg1b/TvzylEcLC6KvQDcIfLMC H7JmlG3Fa9h9MnTaO787AhMFUKtacdYqqfTJ9yDiHib/WSAe+USZE99ocUHyFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZfHQx52K6zfDy; Fri, 18 Apr 2025 14:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53IEbD8e091839; Fri, 18 Apr 2025 14:37:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IEbDHQ091836; Fri, 18 Apr 2025 14:37:13 GMT (envelope-from git) Date: Fri, 18 Apr 2025 14:37:13 GMT Message-Id: <202504181437.53IEbDHQ091836@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7b9d08676f33 - stable/14 - LinuxKPI: 802.11: more fields moved from vif to bss_conf 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: 7b9d08676f3396f404501c959c4c0a95e3098ff4 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7b9d08676f3396f404501c959c4c0a95e3098ff4 commit 7b9d08676f3396f404501c959c4c0a95e3098ff4 Author: Bjoern A. Zeeb AuthorDate: 2025-04-08 01:04:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-18 14:36:00 +0000 LinuxKPI: 802.11: more fields moved from vif to bss_conf csa_active, color_change_active, mu_mimo_owner also moved from vif to bss_conf; we already have the fields in bss_conf (adjust type for one) so all we have to do is remove the old relics in vif. Sponsored by: The FreeBSD Foundation Tested by: Oleksandr Kryvulia (shuriku shurik.kiev.ua) Tested by: Oleg Nauman (oleg.nauman gmail.com) [rtw88] Differential Revision: https://reviews.freebsd.org/D49734 (cherry picked from commit 5321cf2b15d7bff1b01182cfc4897ac978c63fe7) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 016143874564..8856eee8c696 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -343,6 +343,7 @@ struct ieee80211_bss_conf { bool eht_support; bool csa_active; bool mu_mimo_owner; + bool color_change_active; uint32_t sync_device_ts; uint64_t sync_tsf; uint16_t beacon_int; @@ -363,7 +364,6 @@ struct ieee80211_bss_conf { int twt_requester, uora_exists, uora_ocw_range; int assoc_capability, enable_beacon, hidden_ssid, ibss_joined, twt_protected; int twt_responder, unsol_bcast_probe_resp_interval; - int color_change_active; }; struct ieee80211_channel_switch { @@ -831,9 +831,8 @@ struct ieee80211_vif_cfg { struct ieee80211_vif { /* TODO FIXME */ enum nl80211_iftype type; - int csa_active, mu_mimo_owner; int cab_queue; - int color_change_active, offload_flags; + int offload_flags; enum ieee80211_vif_driver_flags driver_flags; bool p2p; bool probe_req_reg;