From nobody Mon Nov 28 17:26:53 2022 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 4NLXTB2DMRz4jQnk; Mon, 28 Nov 2022 17:26:54 +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 4NLXTB0lgsz431P; Mon, 28 Nov 2022 17:26:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669656414; 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=8c2ARIMqI9EZXwwI1+S2DRTsBMQXny7GcdT4NHfWPD0=; b=yAeIFJZltW9mNF9IsHtkpgujTJ36awXCm434gEt6GrnMVfAKEzDZMYN4E6bqqmt7HNDEDK jf2zL38pBRmo8+NmYj+Sp9jPqAx65/Fi9jVKWdGJhyLw7eUxsWRY1uXCNzxBBzzaXfev8x GMbLGJE4pBG1E5pTq1Mp7vytkewGfFz+m1A5GHr8nzaEgEBDRB+TB9JSm9kYvPDKq4S2b+ Ayc+IPi1NGgOw/msPjJ9HI1afc9H8R7KEqx2fYpTXxdCp2+4xfijusNEvgpBwHox7p/l6w 1ISdPg7WkrdynL4ISJmCfy4TX9xtbagYyE5l7lQEpNvKVPoQWTIbfz8DGGlEPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669656414; 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=8c2ARIMqI9EZXwwI1+S2DRTsBMQXny7GcdT4NHfWPD0=; b=Yrw32bjEz6NKKbuCf/DsHOU3cW7LMaD8fpExg+Gw9+JwwfX4LfkwmadKA+BWibBYTkBoq+ /G79jeTn3K+xXoAz9vPwDPqKxnAPVWLWHyEzP59GMXFf3aoeo4IRhl7NLwdV8y99sUYEsM zflttqaDbhQ638lb1Fg2RuSLaVj78ed+whW9uXzluWLWpoY/sQTNIP/M/A+b61hutx57jj fuoSIPUTsO8guUiG8rC9nu1A3q86awDZr1u8ac1drfZ45WLcclhd1e0vf1R7+lmCnWGlaV UzB8LI3rCOHeNh56BcoyqtwMDPmz3dxwM8le90o0DbE5qJlUA8BWhIwP5v04MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669656414; a=rsa-sha256; cv=none; b=kVxuMvu2mgV72VP6Np9zb/6bh4xCeeIQZlfOgmQTkXjPEKepMGgEuLAmbSL6A1zhh3+PLa 67WfVmGqsytPz9w7RHYB9Nhin/l61Up26t8AgQL2ErXTGIsoUwB9RVDoXE62xxqdrkoTwW QzawOtXduv7i/uYV8rRknVvWGc6w5D+m/KwmpYoULhbJgQiJ4yYES269j9AaXKo9IGeVR9 M+fRPAMSeoum+sU9EME7xXyNwug7HHvgtORZ/+Z7J32QhhYjU4Vnb9YHX7NvRUYOpu7yNO CHeokkYj559ybd0CoZZKL/1mom3kmmcV4177C86iE0tWm3r+/I9R9kWa9XJFrw== 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 4NLXT96wX5zm5T; Mon, 28 Nov 2022 17:26:53 +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 2ASHQrhZ080979; Mon, 28 Nov 2022 17:26:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ASHQrCB080977; Mon, 28 Nov 2022 17:26:53 GMT (envelope-from git) Date: Mon, 28 Nov 2022 17:26:53 GMT Message-Id: <202211281726.2ASHQrCB080977@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: 79ade73967e3 - stable/13 - LinuxKPI: 802.11: add changes to support debugfs in iwlwifi 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 79ade73967e3c2dcf00c0c8e0b3ea1f49955d7bb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=79ade73967e3c2dcf00c0c8e0b3ea1f49955d7bb commit 79ade73967e3c2dcf00c0c8e0b3ea1f49955d7bb Author: Bjoern A. Zeeb AuthorDate: 2022-10-22 20:42:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-11-28 16:29:59 +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 (cherry picked from commit 0080f30ff16ec955f2b8b400c1c89645d6ef65ec) --- 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 */ };