From nobody Mon Feb 24 20:27:14 2025 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 4Z1sjL3RJYz5pq6M; Mon, 24 Feb 2025 20:27:18 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z1sjJ5fmzz3nnh; Mon, 24 Feb 2025 20:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740428836; 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=ph74QVLhjWNDm8MlCOaE0Mopv9Ih21j1gDA6s+EhBvk=; b=c8v7k1wXFm/+ynd5EQuuGcAKhtNsP4dvWj2vLpTw5Z1KkVXibYCmfmjDw3t5KCQ9vRA6yf Z2A9vcydivUq1GDu4o1T+iW5iCZZhf6RfEvgrr5IXkUHpYWwCH+RsWuUdjQBf41Qc8KHeM Xg757SvgbqSGjJ+G2oy3WS9nmpXnxHzFuUtjnv0Jt8FK13mtAIfnnIo5Wdb8pOrGyVJeDk PjkVUaYtLZOkQ/x4gdvwuA6I29n1QQL46HlcazCgJ9DAXVp8UuAYqBihtuZ4d0gkacfEUy secw0AjFALx5eDi/K570iH7bL1IbgPlOTGqmojOXL2KGjvB6+DrlYtzmHzNgLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740428836; a=rsa-sha256; cv=none; b=tHxp62mjyh/6EgINgd7kXQKqbnyikevvu6+x+0ocq0TNqvglmHuFszPHge8FgqFM6wyCSr elLJrttocSRWUcohu9BjPbUTX+FHjIa06ViO8N8karwGAJDHEE0GjDiiKhSGxMJ0SaCBX6 Q4anzC1HMrRS1VEtbQjS//R5QIB99bwYm667UDHa12p8mRR2/RPUXkt1eOKX5moesg9LmV l1WITkY7YZMIhyks6Nz51tYZvgpSqoMjjH87lB3Y/dZKtVvlVjPxyyrxZbwgdjuzKIJf76 B5eTPncQOdC03CoE+NVBKluq7XWk/x2IqMGkQyU53BsgN4NEWCSrAejtN9KiNQ== 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=1740428836; 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=ph74QVLhjWNDm8MlCOaE0Mopv9Ih21j1gDA6s+EhBvk=; b=vRYJS+H79KxWUNLncZghqXSHOld9EAspeg20OlrbjhogH97PekVa3r4hQQXSHKkZxhx7CS 2gUsRUddub5e90I1KYWKzzRTAAR4dz4Frtt8VScw1CElO78IgzOawK5A4MqBHJQno5Z6ca XIHi+ZeZtRTOQb0XPR9FaIWNRs3rmDmvQGbEAORjyj78JdcZzw/4xNO2evtqEX939glKJN VheZ95/4Wx7YAsypYtDT5TWt9x1Y5l0momzbHPytbMn78rDpjXJ2FsaDjroaxtzPfYtg07 kyeA+uI2RBq27gNL0J9notuBHBEJlbCVXyGvfaSBkp+ylh+5BozMW4qAlBdPJQ== 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 4Z1sjG2jjBzvnH; Mon, 24 Feb 2025 20:27:14 +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 51OKREP0027385; Mon, 24 Feb 2025 20:27:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51OKRE7b027382; Mon, 24 Feb 2025 20:27:14 GMT (envelope-from git) Date: Mon, 24 Feb 2025 20:27:14 GMT Message-Id: <202502242027.51OKRE7b027382@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: 75418cb41978 - stable/14 - LinuxKPI: 802.11: make struct ieee80211_tx_info a bit more packed 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 75418cb419785947c409969efe2ee82c6a2ed38c Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=75418cb419785947c409969efe2ee82c6a2ed38c commit 75418cb419785947c409969efe2ee82c6a2ed38c Author: Bjoern A. Zeeb AuthorDate: 2025-01-26 19:37:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-24 20:26:48 +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 (cherry picked from commit 470aaf42c3c0661821a8744ae7c29b096adb4aa3) --- 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];