From nobody Fri Apr 11 21:26:19 2025 X-Original-To: dev-commits-src-main@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 4ZZ8rD22Y4z5shW5; Fri, 11 Apr 2025 21:26:20 +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 4ZZ8rC5CF3z3tTD; Fri, 11 Apr 2025 21:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744406779; 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=fev/QU0QNYv8DUgPa9uCekqXKyNWPvPluxriNFsftKQ=; b=ugCkrx5nM0J6LKKNEmaaMR+eXKPp9RAtUWc57wUaijr0z5YoUbykciOPLPBS441tsup+ty IUP/bSM/SCNaU3gCHqvu+Fc1L7ExB/8wNr4dr8ZZROWirKYX8AWCe1hagZvyIpAcIOTpce IAISHuxBqTwoW6xl4SwavjANgj1p5dZDckeRz/cWIGhqNrMgFfTQT+RWAlew6WgUDb2P9N qa5XMVHVnAY8GW4vNPhwcaUbO5FNadkiewvqvaaXNoYlCXbRCmYPu2oYeU7YegNddzasFS O8D8CoEPnn2qAPL9Z7Lab0Kj4hqj9J84NoEymTPcL3IyZDKknOj7ybcNpxGSSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744406779; a=rsa-sha256; cv=none; b=JD9iITXhORuim4p8W+jD7UlEHbkwpDSdqAJ0+/YCEFQy2WWdfUrsPdhZP6yGUIJmhbXNwt uCoBw2U/CjxerthzMvBnzCDsaYdVkdClGt4VEPonjZBDvQySHptnWbm6alBI3+0qDLb+UQ GL66zTrOIQ+uwtDx4n4ZdKdNdxQlN9YulUgbTHhnmX5EzydqGQScXwiKySNz+jA0ZKQgZm YeaHM1BtrxEslEAeDwA2GE01G63V/c9of9ziOGqPb96UbwTx9W6z68M9N3PTbI9fzzQqD1 QDgXDTEN2Bs4zPJDGoz8YLdKdSL1Na3o2pyVQn9jJ/UqVhwfS2wiYTIObpCrMw== 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=1744406779; 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=fev/QU0QNYv8DUgPa9uCekqXKyNWPvPluxriNFsftKQ=; b=Sl7lQrZQnJn47C1CTOQCvJ92femDytk/Yxv2g7L70zuJAfJIdWgQEAS0SCpYjw0I3h+dv0 7bs5E60gar32+0ib4VQCOqIeaxXIdK8NE65m4CavfAU5E6LHoE2uP2ev9lS1nDS76zXTQd NXgG7iKhUN+H9gZtfrD+exd+pw5DSABWgv/Ulntjn7a1LUL2tJRFkCJBbHKlaAH4Nuhvw6 fIGLNBg76BcSbn324y9YABdsfNaN3tfktsNW57YHnxI6Xm4HCL/KNhbI3x3PaLhh8JYcbo 3Ch0hR01xPPJa2fWrvtQ7G9hgFMqOR6tFL09K+raOSB0kqk+Rjc8+6QgTADesQ== 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 4ZZ8rC4jM0zqFM; Fri, 11 Apr 2025 21:26:19 +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 53BLQJ58078194; Fri, 11 Apr 2025 21:26:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53BLQJY7078191; Fri, 11 Apr 2025 21:26:19 GMT (envelope-from git) Date: Fri, 11 Apr 2025 21:26:19 GMT Message-Id: <202504112126.53BLQJY7078191@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5321cf2b15d7 - main - LinuxKPI: 802.11: more fields moved from vif to bss_conf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 5321cf2b15d7bff1b01182cfc4897ac978c63fe7 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5321cf2b15d7bff1b01182cfc4897ac978c63fe7 commit 5321cf2b15d7bff1b01182cfc4897ac978c63fe7 Author: Bjoern A. Zeeb AuthorDate: 2025-04-08 01:04:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-11 21:18:09 +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 MFC after: 3 days Tested by: Oleksandr Kryvulia (shuriku shurik.kiev.ua) Tested by: Oleg Nauman (oleg.nauman gmail.com) [rtw88] Differential Revision: https://reviews.freebsd.org/D49734 --- 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;