From 9470c670ee0795a846baf4ed4ce0f6e5160f9c82 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 2 Nov 2022 03:10:11 +0100 Subject: [PATCH] ANDROID: fix up CRC issue with struct tcp_sock Commit 3625b684a285 ("tcp: fix tcp_cwnd_validate() to not forget is_cwnd_limited") renames a field in struct tcp_sock from max_packets_seq to cwnd_usage_seq. This is not a real abi break as it is not visible to external modules, but the CRC of the function tcp_sock() is changed. Fix this up with the __GENKSYMS__ hack to preserve the CRC. Bug: 161946584 Fixes: 3625b684a285 ("tcp: fix tcp_cwnd_validate() to not forget is_cwnd_limited") Signed-off-by: Greg Kroah-Hartman Change-Id: I29352ecfa5e49f97c3896782f09ffdb8da2dfaaa --- include/linux/tcp.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 89751c89f11f..97c02c0b3b09 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -258,7 +258,14 @@ struct tcp_sock { u32 packets_out; /* Packets which are "in flight" */ u32 retrans_out; /* Retransmitted packets out */ u32 max_packets_out; /* max packets_out in last window */ +/* GENKSYMS hack to preserve the ABI because of f4ce91ce12a7 ("tcp: fix + * tcp_cwnd_validate() to not forget is_cwnd_limited") + */ +#ifndef __GENKSYMS__ u32 cwnd_usage_seq; /* right edge of cwnd usage tracking flight */ +#else + u32 max_packets_seq; /* right edge of max_packets_out flight */ +#endif u16 urg_data; /* Saved octet of OOB data and control flags */ u8 ecn_flags; /* ECN status bits. */