From: short <>
Date: Fri, 9 Feb 2001 18:13:08 +0000 (+0000)
Subject: Kernel patch update to 2.4.2-pre2.
X-Git-Url: https://git.jankratochvil.net/?p=tcp_rto.git;a=commitdiff_plain;h=a076c70c18b414d5730521be03fdfa183fc517f0

Kernel patch update to 2.4.2-pre2.
---

diff --git a/kernel-2.4.0-test10.diff b/kernel-2.4.0-test10.diff
deleted file mode 100644
index cee79b7..0000000
--- a/kernel-2.4.0-test10.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ru linux-2.4.0-test10-cut-tcp_rto/include/linux/sysctl.h linux-2.4.0-test10c/include/linux/sysctl.h
---- linux-2.4.0-test10-cut-tcp_rto/include/linux/sysctl.h	Sun Nov  5 10:41:15 2000
-+++ linux-2.4.0-test10c/include/linux/sysctl.h	Sun Nov  5 10:39:42 2000
-@@ -275,6 +275,7 @@
- 	NET_TCP_APP_WIN=86,
- 	NET_TCP_ADV_WIN_SCALE=87,
- 	NET_IPV4_NONLOCAL_BIND=88,
-+	NET_TCP_RTO_MAX=89,
- };
- 
- enum {
-diff -ru linux-2.4.0-test10-cut-tcp_rto/include/net/tcp.h linux-2.4.0-test10c/include/net/tcp.h
---- linux-2.4.0-test10-cut-tcp_rto/include/net/tcp.h	Sun Nov  5 10:41:15 2000
-+++ linux-2.4.0-test10c/include/net/tcp.h	Sun Nov  5 10:39:08 2000
-@@ -331,7 +331,8 @@
- #define TCP_DELACK_MIN	(2)	/* minimal time to delay before sending an ACK,
- 				 * 2 scheduler ticks, not depending on HZ. */
- #define TCP_ATO_MIN	2
--#define TCP_RTO_MAX	(120*HZ)
-+#define TCP_RTO_MAX_init	(120*HZ)
-+extern int TCP_RTO_MAX;
- #define TCP_RTO_MIN	(HZ/5)
- #define TCP_TIMEOUT_INIT (3*HZ)	/* RFC 1122 initial RTO value	*/
- 
-diff -ru linux-2.4.0-test10-cut-tcp_rto/net/ipv4/sysctl_net_ipv4.c linux-2.4.0-test10c/net/ipv4/sysctl_net_ipv4.c
---- linux-2.4.0-test10-cut-tcp_rto/net/ipv4/sysctl_net_ipv4.c	Sun Nov  5 10:41:15 2000
-+++ linux-2.4.0-test10c/net/ipv4/sysctl_net_ipv4.c	Sun Nov  5 10:39:09 2000
-@@ -226,6 +226,8 @@
- 	 &sysctl_tcp_app_win, sizeof(int), 0644, NULL, &proc_dointvec},
- 	{NET_TCP_ADV_WIN_SCALE, "tcp_adv_win_scale",
- 	 &sysctl_tcp_adv_win_scale, sizeof(int), 0644, NULL, &proc_dointvec},
-+	{NET_TCP_RTO_MAX, "tcp_rto_max",
-+	 &TCP_RTO_MAX, sizeof(int), 0644, NULL, &proc_dointvec},
- 	{0}
- };
- 
-diff -ru linux-2.4.0-test10-cut-tcp_rto/net/ipv4/tcp_timer.c linux-2.4.0-test10c/net/ipv4/tcp_timer.c
---- linux-2.4.0-test10-cut-tcp_rto/net/ipv4/tcp_timer.c	Sun Nov  5 10:41:15 2000
-+++ linux-2.4.0-test10c/net/ipv4/tcp_timer.c	Sun Nov  5 10:39:09 2000
-@@ -30,6 +30,7 @@
- int sysctl_tcp_retries1 = TCP_RETR1;
- int sysctl_tcp_retries2 = TCP_RETR2;
- int sysctl_tcp_orphan_retries;
-+int TCP_RTO_MAX = TCP_RTO_MAX_init;
- 
- static void tcp_write_timer(unsigned long);
- static void tcp_delack_timer(unsigned long);
diff --git a/kernel-2.4.2-pre2.diff b/kernel-2.4.2-pre2.diff
new file mode 100644
index 0000000..7f1684f
--- /dev/null
+++ b/kernel-2.4.2-pre2.diff
@@ -0,0 +1,47 @@
+diff -ru linux-2.4.2-pre2-cut-tcp_rto/include/linux/sysctl.h linux-2.4.2-pre2c/include/linux/sysctl.h
+--- linux-2.4.2-pre2-cut-tcp_rto/include/linux/sysctl.h	Fri Feb  9 13:31:49 2001
++++ linux-2.4.2-pre2c/include/linux/sysctl.h	Fri Feb  9 13:55:16 2001
+@@ -279,6 +279,7 @@
+ 	NET_TCP_APP_WIN=86,
+ 	NET_TCP_ADV_WIN_SCALE=87,
+ 	NET_IPV4_NONLOCAL_BIND=88,
++	NET_TCP_RTO_MAX=89,
+ };
+ 
+ enum {
+diff -ru linux-2.4.2-pre2-cut-tcp_rto/include/net/tcp.h linux-2.4.2-pre2c/include/net/tcp.h
+--- linux-2.4.2-pre2-cut-tcp_rto/include/net/tcp.h	Fri Feb  9 13:32:20 2001
++++ linux-2.4.2-pre2c/include/net/tcp.h	Fri Feb  9 13:57:37 2001
+@@ -335,7 +335,8 @@
+ #define TCP_DELACK_MIN	4
+ #define TCP_ATO_MIN	4
+ #endif
+-#define TCP_RTO_MAX	(120*HZ)
++#define TCP_RTO_MAX_init	(120*HZ)
++extern int TCP_RTO_MAX;
+ #define TCP_RTO_MIN	(HZ/5)
+ #define TCP_TIMEOUT_INIT (3*HZ)	/* RFC 1122 initial RTO value	*/
+ 
+diff -ru linux-2.4.2-pre2-cut-tcp_rto/net/ipv4/sysctl_net_ipv4.c linux-2.4.2-pre2c/net/ipv4/sysctl_net_ipv4.c
+--- linux-2.4.2-pre2-cut-tcp_rto/net/ipv4/sysctl_net_ipv4.c	Sun Nov  5 10:41:15 2000
++++ linux-2.4.2-pre2c/net/ipv4/sysctl_net_ipv4.c	Sun Nov  5 10:39:09 2000
+@@ -226,6 +226,8 @@
+ 	 &sysctl_tcp_app_win, sizeof(int), 0644, NULL, &proc_dointvec},
+ 	{NET_TCP_ADV_WIN_SCALE, "tcp_adv_win_scale",
+ 	 &sysctl_tcp_adv_win_scale, sizeof(int), 0644, NULL, &proc_dointvec},
++	{NET_TCP_RTO_MAX, "tcp_rto_max",
++	 &TCP_RTO_MAX, sizeof(int), 0644, NULL, &proc_dointvec},
+ 	{0}
+ };
+ 
+diff -ru linux-2.4.2-pre2-cut-tcp_rto/net/ipv4/tcp_timer.c linux-2.4.2-pre2c/net/ipv4/tcp_timer.c
+--- linux-2.4.2-pre2-cut-tcp_rto/net/ipv4/tcp_timer.c	Fri Feb  9 13:32:34 2001
++++ linux-2.4.2-pre2c/net/ipv4/tcp_timer.c	Fri Feb  9 13:29:12 2001
+@@ -30,6 +30,7 @@
+ int sysctl_tcp_retries1 = TCP_RETR1;
+ int sysctl_tcp_retries2 = TCP_RETR2;
+ int sysctl_tcp_orphan_retries;
++int TCP_RTO_MAX = TCP_RTO_MAX_init;
+ 
+ static void tcp_write_timer(unsigned long);
+ static void tcp_delack_timer(unsigned long);
diff --git a/versions b/versions
index 2e2f7fd..b199ff6 100644
--- a/versions
+++ b/versions
@@ -1,2 +1,2 @@
 kernel22_ver=2.2.17
-kernel24_ver=2.4.0-test10
+kernel24_ver=2.4.2-pre2