Re: [PATCH v2 packetdrill 1/1] net-test: pacetkdrill: move new fields of tcpi to the struct end

[Neal Cardwell]

Thanks! Merged that commit here:

https://github.com/google/packetdrill/commit/1995725153ba11b3c3733bf3e7218e03c75db9ed

(Fixed a typo in the commit title, and reworded the title slightly to
make it more specific.)

Thanks!
neal

On Wed, Jan 21, 2026 at 5:27 PM <chia-y...@nokia-bell-labs.com> wrote:
>
> From: Chia-Yu Chang <chia-y...@nokia-bell-labs.com>
>
> New fields (tcpi_ecn_mode, tcpi_accecn_opt_seen,
> tcpi_accecn_fail_mode, and tcpi_options2) of tcpi are moved to the
> end of struct, which is consitent with the tcpi struct in the
> latest kernel.
>
> Signed-off-by: Chia-Yu Chang <chia-y...@nokia-bell-labs.com>
> ---
> gtests/net/packetdrill/tcp.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/gtests/net/packetdrill/tcp.h b/gtests/net/packetdrill/tcp.h
> index 544d06e8d1b0..d0b3c553c71d 100644
> --- a/gtests/net/packetdrill/tcp.h
> +++ b/gtests/net/packetdrill/tcp.h
> @@ -261,10 +261,6 @@ struct _tcp_info {
> * in milliseconds, including any
> * unfinished recovery.
> */
> - __u32 tcpi_ecn_mode:2,
> - tcpi_accecn_opt_seen:2,
> - tcpi_accecn_fail_mode:4,
> - tcpi_options2:24;
> __u32 tcpi_received_ce; /* # of CE marked segments received */
> __u32 tcpi_delivered_e1_bytes; /* Accurate ECN byte counters */
> __u32 tcpi_delivered_e0_bytes;
> @@ -272,6 +268,10 @@ struct _tcp_info {
> __u32 tcpi_received_e1_bytes;
> __u32 tcpi_received_e0_bytes;
> __u32 tcpi_received_ce_bytes;
> + __u32 tcpi_ecn_mode:2,
> + tcpi_accecn_opt_seen:2,
> + tcpi_accecn_fail_mode:4,
> + tcpi_options2:24;
> };
>
> /* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */
> --
> 2.34.1
>