patch-2.3.18 linux/include/net/tcp.h

• Lines: 68
• Date: Thu Sep 9 22:21:27 1999
• Orig file: v2.3.17/linux/include/net/tcp.h
• Orig date: Thu Aug 26 13:05:41 1999

diff -u --recursive --new-file v2.3.17/linux/include/net/tcp.h linux/include/net/tcp.h
@@ -33,7 +33,7 @@
 struct tcp_ehash_bucket {
 	rwlock_t	lock;
 	struct sock	*chain;
-} __attribute__((__aligned__(SMP_CACHE_BYTES)));
+} __attribute__((__aligned__(8)));
 
 extern int tcp_ehash_size;
 extern struct tcp_ehash_bucket *tcp_ehash;
@@ -286,7 +286,12 @@
 				 * there is no window			*/
 #define TCP_KEEPALIVE_TIME (120*60*HZ)		/* two hours */
 #define TCP_KEEPALIVE_PROBES	9		/* Max of 9 keepalive probes	*/
-#define TCP_KEEPALIVE_PERIOD ((75*HZ)>>2)	/* period of keepalive check	*/
+#define TCP_KEEPALIVE_INTVL	(75*HZ)
+
+#define MAX_TCP_KEEPIDLE	32767
+#define MAX_TCP_KEEPINTVL	32767
+#define MAX_TCP_KEEPCNT		127
+#define MAX_TCP_SYNCNT		127
 
 #define TCP_SYNACK_PERIOD	(HZ/2) /* How often to run the synack slow timer */
 #define TCP_QUICK_TRIES		8  /* How often we try to retransmit, until
@@ -332,6 +337,12 @@
 #define TIME_PROBE0	4
 #define TIME_KEEPOPEN	5
 
+/* sysctl variables for tcp */
+extern int sysctl_tcp_keepalive_time;
+extern int sysctl_tcp_keepalive_probes;
+extern int sysctl_tcp_keepalive_intvl;
+extern int sysctl_tcp_syn_retries;
+
 struct open_request;
 
 struct or_calltable {
@@ -611,7 +622,7 @@
 extern void tcp_send_partial(struct sock *);
 extern void tcp_write_wakeup(struct sock *);
 extern void tcp_send_fin(struct sock *sk);
-extern void tcp_send_active_reset(struct sock *sk);
+extern void tcp_send_active_reset(struct sock *sk, int priority);
 extern int  tcp_send_synack(struct sock *);
 extern void tcp_transmit_skb(struct sock *, struct sk_buff *);
 extern void tcp_send_skb(struct sock *, struct sk_buff *, int force_queue);
@@ -1229,6 +1240,22 @@
 {
 	if (atomic_dec_and_test(&tcp_lhash_users))
 		wake_up(&tcp_lhash_wait);
+}
+
+static inline int keepalive_intvl_when(struct tcp_opt *tp)
+{
+	if (tp->keepalive_intvl)
+		return tp->keepalive_intvl;
+	else
+		return sysctl_tcp_keepalive_intvl;
+}
+
+static inline int keepalive_time_when(struct tcp_opt *tp)
+{
+	if (tp->keepalive_time)
+		return tp->keepalive_time;
+	else
+		return sysctl_tcp_keepalive_time;
 }
 
 #endif	/* _TCP_H */