BSD 4_3_Tahoe release

[unix-history] / 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 78e883a..45f827f 100644 (file)
--- a/usr/src/sys/netinet/tcp_timer.c
+++ b/usr/src/sys/netinet/tcp_timer.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
+ * Copyright (c) 1982, 1986 Regents of the University of California.

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted


@@ -14,12 +14,11 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)tcp_timer.c 7.15 (Berkeley) %G%
+ *     @(#)tcp_timer.c 7.14 (Berkeley) 6/29/88

  */
 
 #include "param.h"
 #include "systm.h"
  */
 
 #include "param.h"
 #include "systm.h"

-#include "malloc.h"

 #include "mbuf.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "mbuf.h"
 #include "socket.h"
 #include "socketvar.h"


@@ -182,9 +181,7 @@ tcp_timers(tp, timer)
                 * retransmit times until then.
                 */
                if (tp->t_rxtshift > TCP_MAXRXTSHIFT / 4) {
                 * retransmit times until then.
                 */
                if (tp->t_rxtshift > TCP_MAXRXTSHIFT / 4) {

-#if BSD>=43

                        in_losing(tp->t_inpcb);
                        in_losing(tp->t_inpcb);

-#endif

                        tp->t_rttvar += (tp->t_srtt >> 2);
                        tp->t_srtt = 0;
                }
                        tp->t_rttvar += (tp->t_srtt >> 2);
                        tp->t_srtt = 0;
                }


@@ -269,10 +266,10 @@ tcp_timers(tp, timer)
                         * The keepalive packet must have nonzero length
                         * to get a 4.2 host to respond.
                         */
                         * The keepalive packet must have nonzero length
                         * to get a 4.2 host to respond.
                         */

-                       tcp_respond(tp, tp->t_template, (struct mbuf *)NULL,
+                       tcp_respond(tp, tp->t_template,

                            tp->rcv_nxt - 1, tp->snd_una - 1, 0);
 #else
                            tp->rcv_nxt - 1, tp->snd_una - 1, 0);
 #else

-                       tcp_respond(tp, tp->t_template, (struct mbuf *)NULL,
+                       tcp_respond(tp, tp->t_template,

                            tp->rcv_nxt, tp->snd_una - 1, 0);
 #endif
                        tp->t_timer[TCPT_KEEP] = tcp_keepintvl;
                            tp->rcv_nxt, tp->snd_una - 1, 0);
 #endif
                        tp->t_timer[TCPT_KEEP] = tcp_keepintvl;