X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/c47a59095b9d2bde841d455b1539b84329e96ebd..5e35ed2481cff3093e5df1d23606e3f8ce318fba:/usr/src/sys/netinet/tcp_timer.c

diff --git a/usr/src/sys/netinet/tcp_timer.c b/usr/src/sys/netinet/tcp_timer.c
index ad650caae6..725b66834e 100644
--- a/usr/src/sys/netinet/tcp_timer.c
+++ b/usr/src/sys/netinet/tcp_timer.c
@@ -1,4 +1,4 @@
-/*	tcp_timer.c	4.24	82/06/26	*/
+/*	tcp_timer.c	4.28	82/10/20	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -6,21 +6,22 @@
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/protosw.h"
-#include "../net/in.h"
-#include "../net/route.h"
-#include "../net/in_pcb.h"
-#include "../net/in_systm.h"
-#include "../net/if.h"
-#include "../net/ip.h"
-#include "../net/ip_var.h"
-#include "../net/tcp.h"
-#include "../net/tcp_fsm.h"
-#include "../net/tcp_seq.h"
-#include "../net/tcp_timer.h"
-#include "../net/tcp_var.h"
-#include "../net/tcpip.h"
 #include <errno.h>
 
+#include "../net/if.h"
+#include "../net/route.h"
+#include "../netinet/in.h"
+#include "../netinet/in_pcb.h"
+#include "../netinet/in_systm.h"
+#include "../netinet/ip.h"
+#include "../netinet/ip_var.h"
+#include "../netinet/tcp.h"
+#include "../netinet/tcp_fsm.h"
+#include "../netinet/tcp_seq.h"
+#include "../netinet/tcp_timer.h"
+#include "../netinet/tcp_var.h"
+#include "../netinet/tcpip.h"
+
 int	tcpnodelack = 0;
 /*
  * Fast timeout routine for processing delayed acks
@@ -72,7 +73,8 @@ tcp_slowtimo()
 			if (tp->t_timer[i] && --tp->t_timer[i] == 0) {
 				(void) tcp_usrreq(tp->t_inpcb->inp_socket,
 				    PRU_SLOWTIMO, (struct mbuf *)0,
-				    (caddr_t)i);
+				    (struct mbuf *)i,
+				    (struct socketopt *)0);
 				if (ipnxt->inp_prev != ip)
 					goto tpgone;
 			}
@@ -192,18 +194,5 @@ printf("rexmt set to %d\n", tp->t_timer[TCPT_REXMT]);
 	dropit:
 		tcp_drop(tp, ETIMEDOUT);
 		return;
-
-#ifdef TCPTRUEOOB
-	/*
-	 * Out-of-band data retransmit timer.
-	 */
-	case TCPT_OOBREXMT:
-		if (tp->t_flags & TF_NOOPT)
-			return;
-		(void) tcp_output(tp);
-		TCPT_RANGESET(tp->t_timer[TCPT_OOBREXMT],
-		    2 * tp->t_srtt, TCPTV_MIN, TCPTV_MAX);
-		return;
-#endif
 	}
 }