From nobody Sat Dec 31 02:33:05 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 4NkR4d5x3jz2lB0f; Sat, 31 Dec 2022 02:33:05 +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 4NkR4d5DxDz4HRl; Sat, 31 Dec 2022 02:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672453985; 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=lJoS0nebolV8RDMAkmoQ1JdjqG1mjkaFA0+nc1Uu6BM=; b=l5wY0HktyH04vlU5lNIm2EUY0UWr3kHirKHUoWWDd5ib7zu/7UTWR4Lcxafe3vLwKLk/qP ZsI4Sw4I3L3/HzUJ8i6rHWwkqPWqybadSvD1u64RvCrd/i8wovN4HveTgZUKcmxH0aK7D2 WIDmDk5Np2rHRvj72DqwnO9ASGrPPfxvuOfgpDregXRBh7WwRXezk1ev9tJl4sx+eKfMzj reuwHynj2AQRSg4dv8Tq8g5i5qd4yFHOrl03NlScu9vJf82jaknHilWk5yXPVgGkhrsgYT wjCvhIvp9uTY3oUVYldOo/GSbkFRtmcG35uyc7DeIh91mXEjeXH55XmysaHkug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672453985; 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=lJoS0nebolV8RDMAkmoQ1JdjqG1mjkaFA0+nc1Uu6BM=; b=PG86+TPVJ2olFgNi7aPyVN/YlGDCYrAw9VVv7LHHNr4yxm/0hIC800npjeH/rUEdzhVfhF saX+EsrOLCPNwI5spel9IGLQFh7bR4O7XixplWsi0rP20LvxpKEG6X+je8x7/ReVGx3QA8 +K7+QlnMwpIWYj48L69QPfF8LUixLCZ5eV394q+8On1GLvOZN9Qr+jLJsQCOVtmhX0U0kY VXYpuC4ufAH12xEHll+dwscoR1PAW1vlfEcKFr0j4AbSincnAnhvTm084HWtCnsgscdUOK V6ESN+GOVZYFitAFrTylsV3CU9gH5ojnPIUR65l9X1k6YzQGswg/s/GmRYFSoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672453985; a=rsa-sha256; cv=none; b=GrT7QCJwDyCpT/6v5bZ/iMcopNB+Y1y+UTs0lb7RPRn/ooU0/OEnrci/sF8oI5UqmYaYTp Y/I1IIKqhXiVlVMP3TTbrG5CUz7QNEfq2Nyxe7TMHw/tyP+cbp8d7Sbf2UXwe9nEA1EPrV vH7Xjd1pGrVsPLscZB2N5H1Zz3hNza+mIH8MSavw78idQEYFPWRyHuKOej/onZ8iZ2MYaw p9zMWtJIRo88GLqbNb7Rhc3hPDhdPbm8G9JcV9tnTt7dys77aIs/li7LtW0hpmvzRmhjsu EsZfNeNXQ88gGfy7MEHitHDPt/Zsoyx7Tb+jse5ch2oMU/QGkiMucOB3jDvA0Q== 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 4NkR4d47xKzXZY; Sat, 31 Dec 2022 02:33:05 +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 2BV2X5nh021193; Sat, 31 Dec 2022 02:33:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BV2X5KW021192; Sat, 31 Dec 2022 02:33:05 GMT (envelope-from git) Date: Sat, 31 Dec 2022 02:33:05 GMT Message-Id: <202212310233.2BV2X5KW021192@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: c990500bf102 - main - LinuxKPI; 802.11: update mac80211.h structures and fields 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: c990500bf1028d55cdd370037c78ea808956e0fc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c990500bf1028d55cdd370037c78ea808956e0fc commit c990500bf1028d55cdd370037c78ea808956e0fc Author: Bjoern A. Zeeb AuthorDate: 2022-12-31 02:15:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-12-31 02:15:28 +0000 LinuxKPI; 802.11: update mac80211.h structures and fields Cleanup some fields and structures and add new ones. Sponsored by: The FreeBSD Foundation MFC after: 10 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 2e4051952818..1a6c12a91356 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -224,6 +224,10 @@ struct ieee80211_chanctx_conf { uint8_t drv_priv[0] __aligned(CACHE_LINE_SIZE); }; +struct ieee80211_rate_status { + struct rate_info rate_idx; +}; + #define WLAN_MEMBERSHIP_LEN (8) #define WLAN_USER_POSITION_LEN (16) @@ -557,15 +561,12 @@ struct ieee80211_rx_status { uint8_t rate_idx; }; -struct ieee80211_tx_rate_status { -}; - struct ieee80211_tx_status { struct ieee80211_sta *sta; struct ieee80211_tx_info *info; u8 n_rates; - struct ieee80211_tx_rate_status *rates; + struct ieee80211_rate_status *rates; struct sk_buff *skb; struct list_head *free_list; @@ -609,6 +610,11 @@ struct ieee80211_sta_txpwr { short power; }; +struct ieee80211_sta_agg { + /* XXX TODO */ + int max_amsdu_len; +}; + struct ieee80211_link_sta { uint32_t supp_rates[NUM_NL80211_BANDS]; struct ieee80211_sta_ht_cap ht_cap; @@ -617,6 +623,8 @@ struct ieee80211_link_sta { struct ieee80211_sta_he_6ghz_capa he_6ghz_capa; uint8_t rx_nss; enum ieee80211_sta_rx_bw bandwidth; + enum ieee80211_smps_mode smps_mode; + struct ieee80211_sta_agg agg; struct ieee80211_sta_txpwr txpwr; }; @@ -682,6 +690,7 @@ enum ieee80211_vif_driver_flags { struct ieee80211_vif_cfg { uint16_t aid; bool assoc; + bool ps; int arp_addr_cnt; uint32_t arp_addr_list[IEEE80211_BSS_ARP_ADDR_LIST_LEN]; /* big endian */ };