Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33437b29 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ANDROID: preserve CRC for struct tcp_sock 



In commit fe7a7b89 ("tcp: add TCP_INFO status for failed client
TFO"), 2 unused bits in struct tcp_sock were renamed and used.  This
does not change the binary abi, but the checking tools do notice this,
so mark it as such so that the CRC generation remains the same.

Fixes: fe7a7b89 ("tcp: add TCP_INFO status for failed client TFO")
Change-Id: I160605fb220d393c77ed4972957cbf823980694c
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent f90cc3d8

android/abi_gki_aarch64.xml

+2131 −2131

File changed.

File size exceeds preview limit.

View original file
View changed file

include/linux/tcp.h

+7 −0
Original line number Diff line number Diff line
@@ -225,7 +225,14 @@ struct tcp_sock { 
		fastopen_connect:1, /* FASTOPEN_CONNECT sockopt */

		fastopen_no_cookie:1, /* Allow send/recv SYN+data without a cookie */

		is_sack_reneg:1,    /* in recovery from loss with SACK reneg? */

/* ANDROID

 * CRC preservation for commit fe7a7b894273 ("tcp: add TCP_INFO status for failed client TFO")

 */

#ifndef __GENKSYMS__

		fastopen_client_fail:2; /* reason why fastopen failed */

#else

		unused:2;

#endif

	u8	nonagle     : 4,/* Disable Nagle algorithm?             */

		thin_lto    : 1,/* Use linear timeouts for thin streams */

		recvmsg_inq : 1,/* Indicate # of bytes in queue upon recvmsg */