From 78c388aed2b7184182c08428db1de6c872d815f5 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 4 Jan 1999 16:03:48 +0000
Subject: Merge with Linux 2.1.131 and more MIPS goodies.

(Did I mention that CVS is buggy ...)
---
 net/ipv4/sysctl_net_ipv4.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'net/ipv4/sysctl_net_ipv4.c')

diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 65bc5f0fc..c186a8953 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -1,7 +1,7 @@
 /*
  * sysctl_net_ipv4.c: sysctl interface to net IPV4 subsystem.
  *
- * $Id: sysctl_net_ipv4.c,v 1.34 1998/04/11 09:38:26 freitag Exp $
+ * $Id: sysctl_net_ipv4.c,v 1.36 1998/10/21 05:26:59 davem Exp $
  *
  * Begun April 1, 1996, Mike Shaver.
  * Added /proc/sys/net/ipv4 directory entry (empty =) ). [MS]
@@ -43,8 +43,6 @@ extern int sysctl_ip_dynaddr;
 /* From ip_masq.c */
 extern int sysctl_ip_masq_debug;
 
-extern int sysctl_tcp_cong_avoidance;
-extern int sysctl_tcp_hoe_retransmits;
 extern int sysctl_tcp_timestamps;
 extern int sysctl_tcp_window_scaling;
 extern int sysctl_tcp_sack;
@@ -93,9 +91,6 @@ int ipv4_sysctl_forward(ctl_table *ctl, int write, struct file * filp,
 
 
 ctl_table ipv4_table[] = {
-        {NET_IPV4_TCP_HOE_RETRANSMITS, "tcp_hoe_retransmits",
-         &sysctl_tcp_hoe_retransmits, sizeof(int), 0644, NULL,
-         &proc_dointvec},
         {NET_IPV4_TCP_TIMESTAMPS, "tcp_timestamps",
          &sysctl_tcp_timestamps, sizeof(int), 0644, NULL,
          &proc_dointvec},
-- 
cgit v1.2.3