From nobody Mon Nov 28 17:26:59 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 4NLXTH5SYjz4jQW0; Mon, 28 Nov 2022 17:26:59 +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 4NLXTH4psrz43ZP; Mon, 28 Nov 2022 17:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669656419; 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=mVskDklKmQqocWucUKAAj2lxvB5olBs6gojWBrcKH+U=; b=fYh6DsvJ+mfrDVdhHq0fjger4NZtHxngkgUXEz5hKE3ZH4cgLOp0R3+i44jnu11m24Qqee cUPRchWglqYdPZescysVXHveZhmUmlK1niZVsVrwHfzEZH3ZrX/Pje7ccPCJLSa87GOUe3 lBKADQa0rMkQ1qbvbLnW5x8DNB9A588YiQQKfYuC/O4AsJ/plPrqarPkYnsYd0bsDio+QU sFwLClYUUzDbT+YXeyXVKJq7VCZWrK0NtHT14Ez4MUOwCsV6eBOup9FuLEFcNPGRdMBC0R BVDC9IXvU8imvB2tVWlAiwqJO597NWPC6NlEhnCvbjDVOsmBI5ixLIQVcgztJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669656419; 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=mVskDklKmQqocWucUKAAj2lxvB5olBs6gojWBrcKH+U=; b=UlEN2zAlm/+wxB3a64rHF9n1Iwl0a7giq/ORP6rf9T2fTcuz5v6AJum+iU6wf8AYvKmjeM pJHslLAqCNZCATKeq54E+asHGplPXKuCAhz8h9V/4AXqWz3p7i0hwrHKI3EOgP9Nnwi/3r qr9+2YpPfuq/WauQDQw5N6yxpwd/Rvu9CKuWlgHJZUJ7fYGnEtdOwoiIuKeysji/xr1G8Y zk41PujHvsrox/Xi5KKaRvyz83TCr0LrvymWLRkSPQdTyHSDdYijGngGf9OqzyKrQiEYhG slicPyYZOQcve6AhCiIu3kKlbdlg0+GeDLGGRftYuk8WR7Lt+7IWVo2nHn2XEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669656419; a=rsa-sha256; cv=none; b=JO/nYXssJCWCJ4VRT7PY5vPLmEicjHFzegE7ejOJXxoJt8CcgaQ+f5bfZIszGOqtvGRYVd hnuwVBXJ55B6YbfhjnRgDPX5ibIIpAq1kfQ7lvF9fdUS/HpuvZke0veYUaw5SP+QcG0ogU fPMCTTS9gf9fslA1JG3KTFp4MEWIlE2CIaBEzcAefd3tRTmXUvgPYjng3klrOFuB41xft2 fgmzS51oOuRv3g6BK9e84vEK2FnEPUiAk7DVX1Fvx9pLAR2vTis+9pdhpN6Td46MoVG/m5 USuYsx9j9b21Nb/2yY8ADl6rMtPYS9sEAVnmiWeslgTXq4l7gTzDvYGtLY61/w== 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 4NLXTH3hW5zm0h; Mon, 28 Nov 2022 17:26:59 +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 2ASHQxIU081113; Mon, 28 Nov 2022 17:26:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ASHQxSM081112; Mon, 28 Nov 2022 17:26:59 GMT (envelope-from git) Date: Mon, 28 Nov 2022 17:26:59 GMT Message-Id: <202211281726.2ASHQxSM081112@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: afb48bd5751c - stable/13 - LinuxKPI: 802.11: update struct member types 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: afb48bd5751c9f9e7c2ca322910e6510d3f3b77e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=afb48bd5751c9f9e7c2ca322910e6510d3f3b77e commit afb48bd5751c9f9e7c2ca322910e6510d3f3b77e Author: Bjoern A. Zeeb AuthorDate: 2022-10-31 22:24:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-11-28 16:30:31 +0000 LinuxKPI: 802.11: update struct member types Update struct member types for ongoing work towards HT support. Sponsored by: The FreeBSD Foundation (cherry picked from commit 05e640dc9e13015735d25366fc0e088939f1e099) --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 4 ++-- sys/compat/linuxkpi/common/include/net/mac80211.h | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 7995f633256f..41fe6983eb4d 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -173,9 +173,9 @@ struct ieee80211_rate { }; struct ieee80211_sta_ht_cap { - /* TODO FIXME */ - int ampdu_density, ampdu_factor; bool ht_supported; + uint8_t ampdu_density; + uint8_t ampdu_factor; uint16_t cap; struct ieee80211_mcs_info mcs; }; diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index a7836df006d8..7f6d50de6b78 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -618,13 +618,16 @@ struct ieee80211_link_sta { #define IEEE80211_NUM_TIDS 16 /* net80211::WME_NUM_TID */ struct ieee80211_sta { /* TODO FIXME */ - int max_amsdu_len, max_amsdu_subframes, max_rc_amsdu_len, max_sp; - int mfp, smps_mode, tdls, tdls_initiator, uapsd_queues, wme; + int max_amsdu_len, max_amsdu_subframes, max_rc_amsdu_len; + int mfp, smps_mode, tdls, tdls_initiator; struct ieee80211_txq *txq[IEEE80211_NUM_TIDS + 1]; /* iwlwifi: 8 and adds +1 to tid_data, net80211::IEEE80211_TID_SIZE */ struct ieee80211_sta_rates *rates; /* some rcu thing? */ uint32_t max_tid_amsdu_len[IEEE80211_NUM_TIDS]; uint8_t addr[ETH_ALEN]; uint16_t aid; + bool wme; + uint8_t max_sp; + uint8_t uapsd_queues; struct ieee80211_link_sta deflink;