Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2

1 files changed, 14 insertions, 4 deletions

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 72705eaf4b84..263e37271afd 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -89,7 +89,7 @@ struct tcp_sack_block {
 
 struct tcp_options_received {
 /*      PAWS/RTTM data  */
-        long    ts_recent_stamp;/* Time we stored ts_recent (for aging) */
+        int     ts_recent_stamp;/* Time we stored ts_recent (for aging) */
         u32     ts_recent;      /* Time stamp to echo next              */
         u32     rcv_tsval;      /* Time stamp value                     */
         u32     rcv_tsecr;      /* Time stamp echo reply                */
@@ -181,10 +181,16 @@ struct tcp_sock {
         u32     data_segs_out;  /* RFC4898 tcpEStatsPerfDataSegsOut
                                  * total number of data segments sent.
                                  */
+        u64     bytes_sent;     /* RFC4898 tcpEStatsPerfHCDataOctetsOut
+                                 * total number of data bytes sent.
+                                 */
         u64     bytes_acked;    /* RFC4898 tcpEStatsAppHCThruOctetsAcked
                                  * sum(delta(snd_una)), or how many bytes
                                  * were acked.
                                  */
+        u32     dsack_dups;     /* RFC4898 tcpEStatsStackDSACKDups
+                                 * total number of DSACK blocks received
+                                 */
         u32     snd_una;        /* First byte we want an ack for        */
         u32     snd_sml;        /* Last byte of the most recently transmitted small packet */
         u32     rcv_tstamp;     /* timestamp of last received ACK (for keepalives) */
@@ -214,8 +220,7 @@ struct tcp_sock {
 #define TCP_RACK_RECOVERY_THRESH 16
                 u8 reo_wnd_persist:5, /* No. of recovery since last adj */
                    dsack_seen:1, /* Whether DSACK seen after last adj */
-                   advanced:1,   /* mstamp advanced since last lost marking */
-                   reord:1;      /* reordering detected */
+                   advanced:1;   /* mstamp advanced since last lost marking */
         } rack;
         u16     advmss;         /* Advertised MSS                       */
         u8      compressed_ack;
@@ -261,6 +266,7 @@ struct tcp_sock {
         u8      ecn_flags;      /* ECN status bits.                     */
         u8      keepalive_probes; /* num of allowed keep alive probes   */
         u32     reordering;     /* Packet reordering metric.            */
+        u32     reord_seen;     /* number of data packet reordering events */
         u32     snd_up;         /* Urgent pointer               */
 
 /*
@@ -330,6 +336,9 @@ struct tcp_sock {
                                  * the first SYN. */
         u32     undo_marker;    /* snd_una upon a new recovery episode. */
         int     undo_retrans;   /* number of undoable retransmissions. */
+        u64     bytes_retrans;  /* RFC4898 tcpEStatsPerfOctetsRetrans
+                                 * Total data bytes retransmitted
+                                 */
         u32     total_retrans;  /* Total retransmits for entire connection */
 
         u32     urg_seq;        /* Seq of received urgent pointer */
@@ -350,6 +359,7 @@ struct tcp_sock {
 #endif
 
 /* Receiver side RTT estimation */
+        u32 rcv_rtt_last_tsecr;
         struct {
                 u32     rtt_us;
                 u32     seq;
@@ -425,7 +435,7 @@ struct tcp_timewait_sock {
         /* The time we sent the last out-of-window ACK: */
         u32                       tw_last_oow_ack_time;
 
-        long                      tw_ts_recent_stamp;
+        int                       tw_ts_recent_stamp;
 #ifdef CONFIG_TCP_MD5SIG
         struct tcp_md5sig_key     *tw_md5_key;
 #endif