Deleted Added
full compact
tcp_timer.c (128019) tcp_timer.c (130989)
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

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

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)tcp_timer.c 8.2 (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

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

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)tcp_timer.c 8.2 (Berkeley) 5/24/95
30 * $FreeBSD: head/sys/netinet/tcp_timer.c 128019 2004-04-07 20:46:16Z imp $
30 * $FreeBSD: head/sys/netinet/tcp_timer.c 130989 2004-06-23 21:04:37Z ps $
31 */
32
33#include "opt_inet6.h"
34#include "opt_tcpdebug.h"
31 */
32
33#include "opt_inet6.h"
34#include "opt_tcpdebug.h"
35#include "opt_tcp_sack.h"
35
36#include <sys/param.h>
37#include <sys/kernel.h>
38#include <sys/lock.h>
39#include <sys/mbuf.h>
40#include <sys/mutex.h>
41#include <sys/protosw.h>
42#include <sys/socket.h>

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

212 INP_INFO_WLOCK(&tcbinfo);
213 inp = tp->t_inpcb;
214 if (!inp) {
215 INP_INFO_WUNLOCK(&tcbinfo);
216 splx(s);
217 return;
218 }
219 INP_LOCK(inp);
36
37#include <sys/param.h>
38#include <sys/kernel.h>
39#include <sys/lock.h>
40#include <sys/mbuf.h>
41#include <sys/mutex.h>
42#include <sys/protosw.h>
43#include <sys/socket.h>

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

213 INP_INFO_WLOCK(&tcbinfo);
214 inp = tp->t_inpcb;
215 if (!inp) {
216 INP_INFO_WUNLOCK(&tcbinfo);
217 splx(s);
218 return;
219 }
220 INP_LOCK(inp);
221 tcp_free_sackholes(tp);
220 if (callout_pending(tp->tt_2msl) || !callout_active(tp->tt_2msl)) {
221 INP_UNLOCK(tp->t_inpcb);
222 INP_INFO_WUNLOCK(&tcbinfo);
223 splx(s);
224 return;
225 }
226 callout_deactivate(tp->tt_2msl);
227 /*

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

492 INP_LOCK(inp);
493 if (callout_pending(tp->tt_rexmt) || !callout_active(tp->tt_rexmt)) {
494 INP_UNLOCK(inp);
495 INP_INFO_WUNLOCK(&tcbinfo);
496 splx(s);
497 return;
498 }
499 callout_deactivate(tp->tt_rexmt);
222 if (callout_pending(tp->tt_2msl) || !callout_active(tp->tt_2msl)) {
223 INP_UNLOCK(tp->t_inpcb);
224 INP_INFO_WUNLOCK(&tcbinfo);
225 splx(s);
226 return;
227 }
228 callout_deactivate(tp->tt_2msl);
229 /*

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

494 INP_LOCK(inp);
495 if (callout_pending(tp->tt_rexmt) || !callout_active(tp->tt_rexmt)) {
496 INP_UNLOCK(inp);
497 INP_INFO_WUNLOCK(&tcbinfo);
498 splx(s);
499 return;
500 }
501 callout_deactivate(tp->tt_rexmt);
502 tcp_free_sackholes(tp);
500 /*
501 * Retransmission timer went off. Message has not
502 * been acked within retransmit interval. Back off
503 * to a longer retransmit interval and retransmit one segment.
504 */
505 if (++tp->t_rxtshift > TCP_MAXRXTSHIFT) {
506 tp->t_rxtshift = TCP_MAXRXTSHIFT;
507 tcpstat.tcps_timeoutdrop++;

--- 113 unchanged lines hidden ---
503 /*
504 * Retransmission timer went off. Message has not
505 * been acked within retransmit interval. Back off
506 * to a longer retransmit interval and retransmit one segment.
507 */
508 if (++tp->t_rxtshift > TCP_MAXRXTSHIFT) {
509 tp->t_rxtshift = TCP_MAXRXTSHIFT;
510 tcpstat.tcps_timeoutdrop++;

--- 113 unchanged lines hidden ---