tcp: Make prior_ssthresh a u32

[linux-2.6-omap-h63xx.git] / include / linux / tcp.h

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index bac17c59b24ef8a0c24d93d1fc7e041c6e0b571c..18e62e3d406fe86a83e03a8a34257b54fd069ba7 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -239,6 +239,11 @@ static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req)
        return (struct tcp_request_sock *)req;
 }
 
+struct tcp_deferred_accept_info {
+       struct sock *listen_sk;
+       struct request_sock *request;
+};
+
 struct tcp_sock {
        /* inet_connection_sock has to be the first member of tcp_sock */
        struct inet_connection_sock     inet_conn;
@@ -330,10 +335,12 @@ struct tcp_sock {
        struct tcp_sack_block duplicate_sack[1]; /* D-SACK block */
        struct tcp_sack_block selective_acks[4]; /* The SACKS themselves*/
 
-       struct tcp_sack_block_wire recv_sack_cache[4];
+       struct tcp_sack_block recv_sack_cache[4];
 
-       u32     highest_sack;   /* Start seq of globally highest revd SACK
-                                * (validity guaranteed only if sacked_out > 0) */
+       struct sk_buff *highest_sack;   /* highest skb with SACK received
+                                        * (validity guaranteed only if
+                                        * sacked_out > 0)
+                                        */
 
        /* from STCP, retrans queue hinting */
        struct sk_buff* lost_skb_hint;
@@ -341,17 +348,14 @@ struct tcp_sock {
        struct sk_buff *scoreboard_skb_hint;
        struct sk_buff *retransmit_skb_hint;
        struct sk_buff *forward_skb_hint;
-       struct sk_buff *fastpath_skb_hint;
 
-       int     fastpath_cnt_hint;      /* Lags behind by current skb's pcount
-                                        * compared to respective fackets_out */
        int     lost_cnt_hint;
        int     retransmit_cnt_hint;
 
        u32     lost_retrans_low;       /* Sent seq after any rxmit (lowest) */
 
        u16     advmss;         /* Advertised MSS                       */
-       u16     prior_ssthresh; /* ssthresh saved at recovery start     */
+       u32     prior_ssthresh; /* ssthresh saved at recovery start     */
        u32     lost_out;       /* Lost packets                 */
        u32     sacked_out;     /* SACK'd packets                       */
        u32     fackets_out;    /* FACK'd packets                       */
@@ -375,6 +379,8 @@ struct tcp_sock {
        unsigned int            keepalive_intvl;  /* time interval between keep alive probes */
        int                     linger2;
 
+       struct tcp_deferred_accept_info defer_tcp_accept;
+
        unsigned long last_synq_overflow; 
 
        u32     tso_deferred;