From nobody Wed Jan 18 16:24:58 2023 X-Original-To: dev-commits-src-branches@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 4NxrhB6sTrz2yJPG; Wed, 18 Jan 2023 16:24:58 +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 4NxrhB68fVz3FLY; Wed, 18 Jan 2023 16:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059098; 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=U8hjE1IsKIqAoEJssUUEoityHohTw/bXsOboTKINSiQ=; b=EprzeHlQkk4IH77GHf8MbBFXeFo6vFQlAOlFGrVKgHlzW5bQkDN3st5bQb4JpaTH/woF2X auY2voKxGA3ko8qqfAT9TRGIgUEx9ypoZOoAc/ob8rPNIkIFSBh0AMAEwnkBAYsdBjsscS WjJbCsNxhK+DArQ6W2j1ehOcGcm7B7E8NEZFaGvceEQNcAysIKVZg7h0wXTJUQUktFUYvg qe0iaMJ3sbo4/l7h3gFdgv10kQ/EHwFdeSj0UGQxM33rLDCX/W4FdsEBsvu5zar2NrvL6J o/xfrlrv3Plnx6yuuy97O2F08kzt+j8Q/3rERcV+lXFGn35GKkU6GrEjwTW0Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059098; 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=U8hjE1IsKIqAoEJssUUEoityHohTw/bXsOboTKINSiQ=; b=DMyuxQ6c4LKswAatDDlzhlL/YFFPbaJUPHswRx2P4AplKXLaJJD7pVzbiScV/uX96BOkwl vH4rfnRB2J1pbcYy4s+EHGVWz6BBbZYU+5jZaqAxLTK+URH1cd9inNF32QO6oFuHlSl5Lo 5juv88KfQZTxSs9KeEkozQ+MdEknRO1q3W/UfQfRZwPUpp4gHBlC7pGoVrpA3rTDfA9+3C nGOGn5r//vIajMGl1ZlNqdisfq5FosNxztFTFP8rSb3Yny8uWFt/4Bv1oyd6Uboq0nWvkH X0kZLwFO+qfoCt0WnJB2fZQmQfEW1UhMNEtrPy3ne5BzBzaEMfd8mcBPzBqsqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674059098; a=rsa-sha256; cv=none; b=bHkf82USp9xGNJXxdhGF+GhbJE0VwP+oQLnWcLCzMUPcpmCiQeYfK1ebR9sWcfjfuj+rCh DDHIgE2ummZqmSTY7ejenXQySPbT7kMAKj6g1IFXJG/N5wSp1O385xZobqwvZyhgs2aLCk g1hQodD3v6zKdIzS87IkucooVhiy2Ld19sYU8qNRXJgZn4NENDqpn0epf4GF8DLMwSv5qv T9pFbhnmiyBH/1ek+s+eUQ4hdVY0MNix/H30y0PQya3tpZstwDNNUpPCo2/tAO79FagvCz a4HXUv6Y/Kvu1LTLneVMSjohUFB6E1HUY4QSCdgj/KImd9pz9y+PYgQYc1rrDA== 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 4NxrhB5GYRzHSf; Wed, 18 Jan 2023 16:24:58 +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 30IGOwhJ038142; Wed, 18 Jan 2023 16:24:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30IGOwai038141; Wed, 18 Jan 2023 16:24:58 GMT (envelope-from git) Date: Wed, 18 Jan 2023 16:24:58 GMT Message-Id: <202301181624.30IGOwai038141@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: 5ba6ef0ac529 - stable/13 - LinuxKPI; 802.11: update mac80211.h structures and fields List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 5ba6ef0ac52986ec9861b9aa0a908ca50011d668 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5ba6ef0ac52986ec9861b9aa0a908ca50011d668 commit 5ba6ef0ac52986ec9861b9aa0a908ca50011d668 Author: Bjoern A. Zeeb AuthorDate: 2022-12-31 02:15:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-01-18 13:26:07 +0000 LinuxKPI; 802.11: update mac80211.h structures and fields Cleanup some fields and structures and add new ones. Sponsored by: The FreeBSD Foundation (cherry picked from commit c990500bf1028d55cdd370037c78ea808956e0fc) --- 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 75f2dac02be2..22b00726a727 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 */ };