Deleted Added
full compact
tcp_reass.c (215701) tcp_reass.c (217126)
1/*-
2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 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

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

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_input.c 8.12 (Berkeley) 5/24/95
30 */
31
32#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 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

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

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_input.c 8.12 (Berkeley) 5/24/95
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/netinet/tcp_reass.c 215701 2010-11-22 19:32:54Z dim $");
33__FBSDID("$FreeBSD: head/sys/netinet/tcp_reass.c 217126 2011-01-07 21:40:34Z jhb $");
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37#include "opt_tcpdebug.h"
38
39#include <sys/param.h>
40#include <sys/kernel.h>
41#include <sys/malloc.h>

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

261 */
262 goto present; /* ??? */
263 }
264 m_adj(m, i);
265 *tlenp -= i;
266 th->th_seq += i;
267 }
268 }
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37#include "opt_tcpdebug.h"
38
39#include <sys/param.h>
40#include <sys/kernel.h>
41#include <sys/malloc.h>

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

261 */
262 goto present; /* ??? */
263 }
264 m_adj(m, i);
265 *tlenp -= i;
266 th->th_seq += i;
267 }
268 }
269 tp->t_rcvoopack++;
269 tp->t_rcvoopack++;
270 TCPSTAT_INC(tcps_rcvoopack);
271 TCPSTAT_ADD(tcps_rcvoobyte, *tlenp);
272
273 /*
274 * While we overlap succeeding segments trim them or,
275 * if they are completely covered, dequeue them.
276 */
277 while (q) {

--- 57 unchanged lines hidden ---
270 TCPSTAT_INC(tcps_rcvoopack);
271 TCPSTAT_ADD(tcps_rcvoobyte, *tlenp);
272
273 /*
274 * While we overlap succeeding segments trim them or,
275 * if they are completely covered, dequeue them.
276 */
277 while (q) {

--- 57 unchanged lines hidden ---