ANDROID: fix up CRC issue with struct tcp_sock

Commit 96a3ddb870 ("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: 96a3ddb870 ("tcp: fix tcp_cwnd_validate() to not forget is_cwnd_limited")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I29352ecfa5e49f97c3896782f09ffdb8da2dfaaa
This commit is contained in:
Greg Kroah-Hartman
2022-11-02 03:10:11 +01:00
parent 3905cfd1d6
commit bd66e91ad2

View File

@@ -266,7 +266,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. */