Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes

[linux-2.6] / include / linux / tcp.h

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 794497c7d7551776755cdb6c79fc4a22db43165a..d96d9b1223042320c055f49a2fba9edb0c586a40 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;
@@ -343,10 +348,7 @@ 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;
 
@@ -377,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;