- sync fedora branch

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 583f0e3..14a55e3 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -384,6 +384,7 @@ struct tcp_sock {
        /* FIFO of established children */
        struct open_request     *accept_queue;
        struct open_request     *accept_queue_tail;
+
        unsigned int            keepalive_time;   /* time before keep alive takes place */
        unsigned int            keepalive_intvl;  /* time interval between keep alive probes */
        int                     linger2;

diff --git a/include/net/tcp.h b/include/net/tcp.h
index e1655ee..1478fb3 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1764,16 +1764,6 @@ static inline int tcp_full_space(const struct sock *sk)
        return tcp_win_from_space(sk->sk_rcvbuf); 
 }
 
-struct tcp_listen_opt
-{
-       u8                      max_qlen_log;   /* log_2 of maximal queued SYNs */
-       int                     qlen;
-       int                     qlen_young;
-       int                     clock_hand;
-       u32                     hash_rnd;
-       struct open_request     *syn_table[TCP_SYNQ_HSIZE];
-};
-
 static inline void tcp_acceptq_queue(struct sock *sk, struct open_request *req,
                                         struct sock *child)
 {
@@ -1791,6 +1781,15 @@ static inline void tcp_acceptq_queue(struct sock *sk, struct open_request *req,
        req->dl_next = NULL;
 }
 
+struct tcp_listen_opt
+{
+       u8                      max_qlen_log;   /* log_2 of maximal queued SYNs */
+       int                     qlen;
+       int                     qlen_young;
+       int                     clock_hand;
+       u32                     hash_rnd;
+       struct open_request     *syn_table[TCP_SYNQ_HSIZE];
+};
 
 static inline void
 tcp_synq_removed(struct sock *sk, struct open_request *req)