Merge branch 'next' into for-linus

1 files changed, 6 insertions, 1 deletions

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 531ede8006d9..7f59ee946983 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -111,7 +111,8 @@ enum {
 #define TCPI_OPT_TIMESTAMPS     1
 #define TCPI_OPT_SACK           2
 #define TCPI_OPT_WSCALE         4
-#define TCPI_OPT_ECN            8
+#define TCPI_OPT_ECN            8 /* ECN was negociated at TCP session init */
+#define TCPI_OPT_ECN_SEEN       16 /* we received at least one packet with ECT */
 
 enum tcp_ca_state {
         TCP_CA_Open = 0,
@@ -379,6 +380,10 @@ struct tcp_sock {
         u32     snd_cwnd_clamp; /* Do not allow snd_cwnd to grow above this */
         u32     snd_cwnd_used;
         u32     snd_cwnd_stamp;
+        u32     prior_cwnd;     /* Congestion window at start of Recovery. */
+        u32     prr_delivered;  /* Number of newly delivered packets to
+                                 * receiver in Recovery. */
+        u32     prr_out;        /* Total number of pkts sent during Recovery. */
 
         u32     rcv_wnd;        /* Current receiver window              */
         u32     write_seq;      /* Tail(+1) of data held in tcp send buffer */