From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 23:54:23 +0000 (+0000)
Subject: - sync fedora branch
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~106
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b1bb671e6ee2a9afbc658675edffc5ab9df260f0;p=linux-2.6.git

- sync fedora branch
---

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 583f0e3b6..14a55e3e3 100644
--- 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 e1655ee99..1478fb3fd 100644
--- 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)