Deleted Added
full compact
tcp_output.c (30209) tcp_output.c (33678)
1/*
2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)tcp_output.c 8.4 (Berkeley) 5/24/95
1/*
2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)tcp_output.c 8.4 (Berkeley) 5/24/95
34 * $Id: tcp_output.c,v 1.26 1997/09/16 18:36:05 joerg Exp $
34 * $Id: tcp_output.c,v 1.27 1997/10/07 21:10:06 fenner Exp $
35 */
36
37#include "opt_tcpdebug.h"
38
39#include <sys/param.h>
40#include <sys/systm.h>
41#include <sys/mbuf.h>
42#include <sys/protosw.h>

--- 689 unchanged lines hidden (view full) ---

732 goto again;
733 return (0);
734}
735
736void
737tcp_setpersist(tp)
738 register struct tcpcb *tp;
739{
35 */
36
37#include "opt_tcpdebug.h"
38
39#include <sys/param.h>
40#include <sys/systm.h>
41#include <sys/mbuf.h>
42#include <sys/protosw.h>

--- 689 unchanged lines hidden (view full) ---

732 goto again;
733 return (0);
734}
735
736void
737tcp_setpersist(tp)
738 register struct tcpcb *tp;
739{
740 register t = ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1;
740 register int t = ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1;
741
742 if (tp->t_timer[TCPT_REXMT])
743 panic("tcp_output REXMT");
744 /*
745 * Start/restart persistance timer.
746 */
747 TCPT_RANGESET(tp->t_timer[TCPT_PERSIST],
748 t * tcp_backoff[tp->t_rxtshift],
749 TCPTV_PERSMIN, TCPTV_PERSMAX);
750 if (tp->t_rxtshift < TCP_MAXRXTSHIFT)
751 tp->t_rxtshift++;
752}
741
742 if (tp->t_timer[TCPT_REXMT])
743 panic("tcp_output REXMT");
744 /*
745 * Start/restart persistance timer.
746 */
747 TCPT_RANGESET(tp->t_timer[TCPT_PERSIST],
748 t * tcp_backoff[tp->t_rxtshift],
749 TCPTV_PERSMIN, TCPTV_PERSMAX);
750 if (tp->t_rxtshift < TCP_MAXRXTSHIFT)
751 tp->t_rxtshift++;
752}