From nobody Sat Oct 22 20:46:48 2022 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 4Mvtfx0JPJz4g4bg; Sat, 22 Oct 2022 20:46:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mvtfw6xmkz3DXN; Sat, 22 Oct 2022 20:46:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666471609; 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=CF4Qj3SPrk00sppZeAEgmf8ztPadMvGintwaP+xqlr0=; b=D3eCDKRSWjZiNc9xEbw6WDdP33Wfmtu+ZHM3uIQp+Rgs2QnePIE5BA1oL6bSF/B4czgzjG ZEyv7k2HbWhJ4PW7qoAgGGiCeclh7fcDY9vdrq7pPqKKcjKKbeHf3dp5IIlqjDT9ZarBys nM/QIm5TgOejreuypvO1oQOZ4baVpcH4aCKxhH7ce204FdXBNrWSIhoppbPB6QtR73h4eB O2AVVAjtEDcW4At0m8q7lhls3nSVFfu6oSnFiQ/5gQI9oNF0o87OleeRWivpwIHUDNIhqR qKyuErlSuLZau+ll0jnIq0vmruMN5j5uK5Z7RWCb9cj8IiM0p2Thx+vN4ya4ng== 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 4Mvtfw5qfgzgjH; Sat, 22 Oct 2022 20:46:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29MKkmB3096187; Sat, 22 Oct 2022 20:46:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29MKkmlk096186; Sat, 22 Oct 2022 20:46:48 GMT (envelope-from git) Date: Sat, 22 Oct 2022 20:46:48 GMT Message-Id: <202210222046.29MKkmlk096186@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: 0080f30ff16e - main - LinuxKPI: 802.11: add changes to support debugfs in iwlwifi 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 0080f30ff16ec955f2b8b400c1c89645d6ef65ec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666471609; 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=CF4Qj3SPrk00sppZeAEgmf8ztPadMvGintwaP+xqlr0=; b=sKkCYLQEc97r3m13JXPaaLvU8mTzYcCNjDtKAM/+nWbpSWaqFRq44I+JMGX/G9mGlwNYcj YPGkL7z989TuVMf+JcN+WPtQavLudlRu/VsDxR1RDZAP9DxXDjRaR3Ac+hIph3TbzHwYpf qU6V106B9wb84kMhTa4ajJkVsoTD93WLxsF2t9jLXWf+QNQ8kbFV4ktzFKd6taShl6Qsu5 FSRO8yTmdbxr2Z1eDgn0MJjoHEmyO6+9UGAfGVDHca6jV8IFRqx8AUcGPslHtYHnysM9JD PA3BvmCUdgGb/2CQvd41urdcOOeyBMvjzlfJ/5zjIiz3B8G50t6Hr6KiYmI6Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666471609; a=rsa-sha256; cv=none; b=DWW52Vo0MnSFa8J1jjXUgDuUBcYP4cbh1Ct54ceLlhSj4w03MRwgLpB9eQXgJwIO/F/lNH vCM+kIr8HP9p1/V+Sr4RnqpZ//w1QJDTCeJO6uxLcUoI05P6u8qoEh35cayrFsdlFLOcNv byQAwHQVV0kvXYej0PWA9nYJcUeBTQ4znyp+TVacu7X0KvgpmqZwSPxJG495nHczU4nebl /m00VyOW/b7bJHMfB55E2pUIkrz5abUa0kXQoZJDw097xuDYTl1uHbCi9t8Z4t6PStATBz JbSmG9qCDjl4bZymvwEryNST+qazSfshPxzgg73yct4chWSqPw3d/rjf6bDdrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0080f30ff16ec955f2b8b400c1c89645d6ef65ec commit 0080f30ff16ec955f2b8b400c1c89645d6ef65ec Author: Bjoern A. Zeeb AuthorDate: 2022-10-22 20:42:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-10-22 20:42:35 +0000 LinuxKPI: 802.11: add changes to support debugfs in iwlwifi Add new fields (also have to move a struct up, no changes there) in order to make iwlwifi debugfs support compile. Sposnored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 33 +++++++++++++++-------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 1dfc4d7506f6..a7836df006d8 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -41,6 +41,7 @@ #include #include #include +#include #include #define ARPHRD_IEEE80211_RADIOTAP __LINE__ /* XXX TODO brcmfmac */ @@ -212,6 +213,17 @@ struct mac80211_fils_discovery { uint32_t max_interval; }; +struct ieee80211_chanctx_conf { + /* TODO FIXME */ + int rx_chains_dynamic, rx_chains_static; + bool radar_enabled; + struct cfg80211_chan_def def; + struct cfg80211_chan_def min_def; + + /* Must stay last. */ + uint8_t drv_priv[0] __aligned(CACHE_LINE_SIZE); +}; + #define WLAN_MEMBERSHIP_LEN (8) #define WLAN_USER_POSITION_LEN (16) @@ -256,6 +268,7 @@ struct ieee80211_bss_conf { int mcast_rate[NUM_NL80211_BANDS]; struct cfg80211_bitrate_mask beacon_tx_rate; struct mac80211_fils_discovery fils_discovery; + struct ieee80211_chanctx_conf *chanctx_conf; int ack_enabled, bssid_index, bssid_indicator, cqm_rssi_hyst, cqm_rssi_thold, ema_ap, frame_time_rts_th, ftm_responder; int htc_trig_based_pkt_ext; @@ -267,17 +280,6 @@ struct ieee80211_bss_conf { int color_change_active; }; -struct ieee80211_chanctx_conf { - /* TODO FIXME */ - int rx_chains_dynamic, rx_chains_static; - bool radar_enabled; - struct cfg80211_chan_def def; - struct cfg80211_chan_def min_def; - - /* Must stay last. */ - uint8_t drv_priv[0] __aligned(CACHE_LINE_SIZE); -}; - struct ieee80211_channel_switch { /* TODO FIXME */ int block_tx, count, delay, device_timestamp, timestamp; @@ -434,6 +436,7 @@ struct ieee80211_hw { uint16_t uapsd_queues; uint16_t max_tx_fragments; uint16_t max_listen_interval; + uint32_t extra_beacon_tailroom; netdev_features_t netdev_features; unsigned long flags[BITS_TO_LONGS(NUM_IEEE80211_HW_FLAGS)]; struct ieee80211_conf conf; @@ -691,6 +694,10 @@ struct ieee80211_vif { struct ieee80211_bss_conf bss_conf; uint8_t hw_queue[IEEE80211_NUM_ACS]; +/* #ifdef CONFIG_MAC80211_DEBUGFS */ /* Do not change structure depending on compile-time option. */ + struct dentry *debugfs_dir; +/* #endif */ + /* Must stay last. */ uint8_t drv_priv[0] __aligned(CACHE_LINE_SIZE); }; @@ -938,6 +945,10 @@ struct ieee80211_ops { void (*add_twt_setup)(struct ieee80211_hw *, struct ieee80211_sta *, struct ieee80211_twt_setup *); void (*twt_teardown_request)(struct ieee80211_hw *, struct ieee80211_sta *, u8); + +/* #ifdef CONFIG_MAC80211_DEBUGFS */ /* Do not change depending on compile-time option. */ + void (*sta_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, struct dentry *); +/* #endif */ };