From: Nick Xie <nick@khadas.com>
Date: Thu, 13 Aug 2020 03:34:51 +0000 (+0800)
Subject: Merge tag 'v4.9.232' into khadas-vims-4.9.y
X-Git-Tag: khadas-vims-v0.9.6-release~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c2eacbf2d8f8a9da7b709a7f68af6fed249a9e9;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'v4.9.232' into khadas-vims-4.9.y

This is the 4.9.232 stable release
---

7c2eacbf2d8f8a9da7b709a7f68af6fed249a9e9
diff --cc include/linux/tcp.h
index 4fd7dd9f26fe,53eb9fecd263..95b4be603db2
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@@ -218,10 -218,11 +218,12 @@@ struct tcp_sock 
  		u8 reord;    /* reordering detected */
  	} rack;
  	u16	advmss;		/* Advertised MSS			*/
+ 	u8	tlp_retrans:1,	/* TLP is a retransmission */
+ 		unused_1:7;
  	u8	rate_app_limited:1,  /* rate_{delivered,interval_us} limited? */
 +		fastopen_connect:1, /* FASTOPEN_CONNECT sockopt */
  		is_sack_reneg:1,    /* in recovery from loss with SACK reneg? */
 -		unused:6;
 +		unused:5;
  	u8	nonagle     : 4,/* Disable Nagle algorithm?             */
  		thin_lto    : 1,/* Use linear timeouts for thin streams */
  		thin_dupack : 1,/* Fast retransmit on first dupack      */