From nobody Sun Feb 16 22:40:43 2025 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 4Yx1303PDKz5p3CT; Sun, 16 Feb 2025 22:40:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yx1300p1bz4JCF; Sun, 16 Feb 2025 22:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739745644; 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=JdLt0YWIT85HyjOhKKXa6/rMBZ0ww2EmD1PA/hMHPZg=; b=uqgVhtqTwIgZOaDxIY0/ncX3drhsGm6Tspkx5BEhK4enk+9c70a7uZ+egg0FLsp/cy8a14 6/mJRarj35SvDK5Z2uT19TV+C8KsqHX9hdvOPiFq1hujZFwnI2GfWdZL5ierVG2tPX67Jt eCDIaU86pbTnhKHaHWkDMqoaYjGoMjblKEtX76FM/Zux59FPgq5aDCmB3/9TBEii6HBhDR t+w1IJSyNhIMCm5WE257hfv9F8Igt2kmFC7HmEpvXeQQrXRNI1iiDlK7jYRUecfrkPMlps Vxv43iOIoUzoRu5oU2o3Mx3q7RRz4iLvUCjihxpUZywqphlKsEtikD2mxM3D+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739745644; a=rsa-sha256; cv=none; b=sbeezRulMo9k+OxG9L2Yun98f7LRvRDFwSDnrO3p4zpM5zmySMFf36CFZxSCGFOWL360kQ E9dA8wWtCu1ZQtV2+1l4JF5r1uSOlqG5iO2FkqEqnDDSaHQTPiS2o0PcCWLczFa/Fmu0Qa 3UC+8aqiMtXWzwFBTy51SxuzMzKO+81GEjzTjUeFM6QiStKDmI8h0Buz1YMjzKjM4WqTlN yjJ/jZJE7kdhVHHKXv+RU43ZHeIxU1AS8D/4QJYUR/eFyrm7e9JRpADjQSUO3AI2oBviz5 MIzVuZpVM8bRuZWHXnZ2hYRP9Yavl+VdsaxmbfviDMY3mQEThsKUHFSi3FSP4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739745644; 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=JdLt0YWIT85HyjOhKKXa6/rMBZ0ww2EmD1PA/hMHPZg=; b=vK2vYrD4FfNBcknRt6HDY3N2wNWpcTF8iGsDMvywpllW4o5MAmK/cg0j/UOoY0+bISEx7E Idm2SpumI4J+oVbO1S+GEYzfvR7CyPDGES1Pt/7S2Z9SF/Ixy/mccMLX1szv4oRL/RHIr0 0rlICiWlSNf5PFQjNomVoy5f3m1WuflR0MxJnGTmRYD9GRJiL5xfNyHi0hYH2LT3E8lL23 qFrpSyOzU+QU4JE4ThiFRnhvDlsVDhzXI/3hDcvsXNZCWCaOviDuAGcYtErZDCqMUtLIJb TDhRbrz0hzTz++/91Esui8qSylHz6rbx/oikUxwjxeNyL82P2gU2/71W7Jur8Q== 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 4Yx13003z4z15sy; Sun, 16 Feb 2025 22:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51GMeh7x038413; Sun, 16 Feb 2025 22:40:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51GMehTH038409; Sun, 16 Feb 2025 22:40:43 GMT (envelope-from git) Date: Sun, 16 Feb 2025 22:40:43 GMT Message-Id: <202502162240.51GMehTH038409@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: 470aaf42c3c0 - main - LinuxKPI: 802.11: make struct ieee80211_tx_info a bit more packed 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 470aaf42c3c0661821a8744ae7c29b096adb4aa3 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=470aaf42c3c0661821a8744ae7c29b096adb4aa3 commit 470aaf42c3c0661821a8744ae7c29b096adb4aa3 Author: Bjoern A. Zeeb AuthorDate: 2025-01-26 19:37:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-16 22:24:53 +0000 LinuxKPI: 802.11: make struct ieee80211_tx_info a bit more packed Given I was looking at the struct make it more packed at the beginning at least. In fact it did not shrink but the tx_time_est got expanded. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 2 +- sys/compat/linuxkpi/common/include/linux/nl80211.h | 2 +- sys/compat/linuxkpi/common/include/net/mac80211.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 20527a8174f5..ca1493e666c6 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -413,7 +413,7 @@ enum ieee80211_tx_info_flags { IEEE80211_TX_CTL_RATE_CTRL_PROBE = BIT(18), IEEE80211_TX_CTL_LDPC = BIT(19), IEEE80211_TX_CTL_STBC = BIT(20), -}; +} __packed; enum ieee80211_tx_status_flags { IEEE80211_TX_STATUS_ACK_SIGNAL_VALID = BIT(0), diff --git a/sys/compat/linuxkpi/common/include/linux/nl80211.h b/sys/compat/linuxkpi/common/include/linux/nl80211.h index 254ed6e13f5c..1babd23d65fe 100644 --- a/sys/compat/linuxkpi/common/include/linux/nl80211.h +++ b/sys/compat/linuxkpi/common/include/linux/nl80211.h @@ -133,7 +133,7 @@ enum nl80211_band { /* Keep this last. */ NUM_NL80211_BANDS -}; +} __packed; enum nl80211_chan_flags { /* XXX TODO */ diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 43df740b0bd0..f1b1ec97cbbc 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -879,11 +879,11 @@ struct ieee80211_prep_tx_info { /* XXX-BZ too big, over-reduce size to u8, and array sizes to minuimum to fit in skb->cb. */ /* Also warning: some sizes change by pointer size! This is 64bit only. */ struct ieee80211_tx_info { - enum ieee80211_tx_info_flags flags; + enum ieee80211_tx_info_flags flags; /* 32 bits */ /* TODO FIXME */ - u8 band; - u8 hw_queue; - bool tx_time_est; + enum nl80211_band band; /* 3 bits */ + uint16_t hw_queue:4, /* 4 bits */ + tx_time_est:10; /* 10 bits */ union { struct { struct ieee80211_tx_rate rates[4];