From nobody Mon Oct 31 23:00:59 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 4N1TCc0xsqz4glSm; Mon, 31 Oct 2022 23:01:00 +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 4N1TCc0Wb3z3F1G; Mon, 31 Oct 2022 23:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667257260; 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=IwZpWw364giSMK3/U3GRM2BOTfysRkTlw+LjNw/5YFM=; b=XQiaJ0pwu6Hckci/fUKggLJxMsEk7mz5x7fpWpmfiHQw9sfzb+V8Yqmajbp78O3jlLB0Ih i/ZNFbicyoWKw1qtM0CHnnsrO5c+4c5s0xnt+5ucRch/aqIzVCjPuKHLb2XS+F1DTZhOpN 5bSsTm+CwWW+13owGXWacZFAP7RB50sf5gT4qRThp+2jv7A4p85DVqMoscW3vflY8bO4Kt jxvITzesjSvO+JlHvTM8VYOYratyu3Dy91K5C1El9CKZz1Nvg77losCx7WerelNBaR53sK mxFL3EYG0VomU+0L97cZV+uVLu2W6Sw2yPlVLyQa7Pf1UWic7D4uHYi+KYe6mQ== 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 4N1TCb6jmhztbd; Mon, 31 Oct 2022 23:00: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 29VN0xLk097930; Mon, 31 Oct 2022 23:00:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29VN0x9b097929; Mon, 31 Oct 2022 23:00:59 GMT (envelope-from git) Date: Mon, 31 Oct 2022 23:00:59 GMT Message-Id: <202210312300.29VN0x9b097929@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: 05e640dc9e13 - main - LinuxKPI: 802.11: update struct member types 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: 05e640dc9e13015735d25366fc0e088939f1e099 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667257260; 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=IwZpWw364giSMK3/U3GRM2BOTfysRkTlw+LjNw/5YFM=; b=qsjkwxs2RHkjhdCtC1E0kfbnI03mLREPmBlm0C7fdxhQmRTE2zoEjOF0P+0+dp++42JEDK 5wcIe0NEVj8qAunmJOOG7O+yyqhoUtaQ9Gv49FXJQUndjHdOmd/oBHm45arH3AueKdAh23 BFaf4vejjLpy3yOU0ZHa7L7JhP9JS+7pwypMd9ZwvcBG6z8IifoHNbrV6PCqK3JYuq/IkF RpyojxzvASM6fhzqBe/qWT9LdyGw3Qq1D7p/eiuC9YzN05a0KiA4dJZMiVfApt6eb4LHat oRfJIE5KBGbMhcuZZU7RVd3qwHBJM+Ziz1TZxP+CC8eIqhuJMsfjhr6vXtSZQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667257260; a=rsa-sha256; cv=none; b=OpCM1xYmZktOHgDi9GJP4dxEcBjWwcdqS7WV8n76hb67YdhEdMLDJJBfvR05gACa/gAkN1 u7mz6wkd78XhUgxCEaTX8qsmYBrnKw7f0OT5yW4QH+usJtDzgoVWKf9radAq3dWwrEwMq7 KDFDyS1b6Oq7v/nj2OKkcrh1J8ks75MRuADuYAizwouIYLJV2FS1H3HbuOwcrDPbosEqb+ O2XgVjeudIhXNMEGc523ZdCbNMzOlw4gy1NfsyaC0Yr7xRFnh8eekq7iXISHgGGpId5coP fhF2wBar5hDM0wmliLYDG+hXQ6hrgJ4euJYREeSQxN0UekGUtX92YpVj17yvZA== 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=05e640dc9e13015735d25366fc0e088939f1e099 commit 05e640dc9e13015735d25366fc0e088939f1e099 Author: Bjoern A. Zeeb AuthorDate: 2022-10-31 22:24:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-10-31 22:24:08 +0000 LinuxKPI: 802.11: update struct member types Update struct member types for ongoing work towards HT support. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- 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 fe5103045983..e6f1bd88309d 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 73db00836262..75f2dac02be2 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -623,13 +623,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;