Sun Feb 14 23:47:57 2016 UTC ()
remove duplicated #include of <netinet/in.h>


(rtr)
diff -r1.209 -r1.210 src/sys/netinet/tcp_usrreq.c
cvs diff -r1.209 -r1.210 src/sys/netinet/tcp_usrreq.c (expand / switch to unified diff)

--- src/sys/netinet/tcp_usrreq.c 2015/08/24 22:21:26 1.209
+++ src/sys/netinet/tcp_usrreq.c 2016/02/14 23:47:57 1.210
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: tcp_usrreq.c,v 1.209 2015/08/24 22:21:26 pooka Exp $ */ 1/* $NetBSD: tcp_usrreq.c,v 1.210 2016/02/14 23:47:57 rtr Exp $ */
2 2
3/* 3/*
4 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 4 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -89,27 +89,27 @@ @@ -89,27 +89,27 @@
89 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 89 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
90 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 90 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
91 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 91 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
92 * SUCH DAMAGE. 92 * SUCH DAMAGE.
93 * 93 *
94 * @(#)tcp_usrreq.c 8.5 (Berkeley) 6/21/95 94 * @(#)tcp_usrreq.c 8.5 (Berkeley) 6/21/95
95 */ 95 */
96 96
97/* 97/*
98 * TCP protocol interface to socket abstraction. 98 * TCP protocol interface to socket abstraction.
99 */ 99 */
100 100
101#include <sys/cdefs.h> 101#include <sys/cdefs.h>
102__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.209 2015/08/24 22:21:26 pooka Exp $"); 102__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.210 2016/02/14 23:47:57 rtr Exp $");
103 103
104#ifdef _KERNEL_OPT 104#ifdef _KERNEL_OPT
105#include "opt_inet.h" 105#include "opt_inet.h"
106#include "opt_tcp_debug.h" 106#include "opt_tcp_debug.h"
107#include "opt_mbuftrace.h" 107#include "opt_mbuftrace.h"
108#include "opt_tcp_space.h" 108#include "opt_tcp_space.h"
109#endif 109#endif
110 110
111#include <sys/param.h> 111#include <sys/param.h>
112#include <sys/systm.h> 112#include <sys/systm.h>
113#include <sys/kernel.h> 113#include <sys/kernel.h>
114#include <sys/mbuf.h> 114#include <sys/mbuf.h>
115#include <sys/socket.h> 115#include <sys/socket.h>
@@ -126,29 +126,26 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c @@ -126,29 +126,26 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c
126 126
127#include <net/if.h> 127#include <net/if.h>
128#include <net/route.h> 128#include <net/route.h>
129 129
130#include <netinet/in.h> 130#include <netinet/in.h>
131#include <netinet/in_systm.h> 131#include <netinet/in_systm.h>
132#include <netinet/in_var.h> 132#include <netinet/in_var.h>
133#include <netinet/ip.h> 133#include <netinet/ip.h>
134#include <netinet/in_pcb.h> 134#include <netinet/in_pcb.h>
135#include <netinet/ip_var.h> 135#include <netinet/ip_var.h>
136#include <netinet/in_offload.h> 136#include <netinet/in_offload.h>
137 137
138#ifdef INET6 138#ifdef INET6
139#ifndef INET 
140#include <netinet/in.h> 
141#endif 
142#include <netinet/ip6.h> 139#include <netinet/ip6.h>
143#include <netinet6/in6_pcb.h> 140#include <netinet6/in6_pcb.h>
144#include <netinet6/ip6_var.h> 141#include <netinet6/ip6_var.h>
145#include <netinet6/scope6_var.h> 142#include <netinet6/scope6_var.h>
146#endif 143#endif
147 144
148#include <netinet/tcp.h> 145#include <netinet/tcp.h>
149#include <netinet/tcp_fsm.h> 146#include <netinet/tcp_fsm.h>
150#include <netinet/tcp_seq.h> 147#include <netinet/tcp_seq.h>
151#include <netinet/tcp_timer.h> 148#include <netinet/tcp_timer.h>
152#include <netinet/tcp_var.h> 149#include <netinet/tcp_var.h>
153#include <netinet/tcp_private.h> 150#include <netinet/tcp_private.h>
154#include <netinet/tcp_congctl.h> 151#include <netinet/tcp_congctl.h>