diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-24 06:48:52 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-24 06:48:52 +0000 |
| commit | 460674d99fa3cda2c368453e9618111a2216140d (patch) | |
| tree | 0b45ddbb060a4c6c4ee56247e82b552e8810546d /cpukit/libnetworking/netinet/tcpip.h | |
| parent | 2011-02-23 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-460674d99fa3cda2c368453e9618111a2216140d.tar.bz2 | |
2011-02-24 Ralf Corsépius <ralf.corsepius@rtems.org>
* libnetworking/netinet/in_systm.h,
libnetworking/netinet/tcp_debug.c,
libnetworking/netinet/tcp_debug.h, libnetworking/netinet/tcp_seq.h,
libnetworking/netinet/tcp_var.h, libnetworking/netinet/tcpip.h:
Misc changes from FreeBSD.
Diffstat (limited to 'cpukit/libnetworking/netinet/tcpip.h')
| -rw-r--r-- | cpukit/libnetworking/netinet/tcpip.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/cpukit/libnetworking/netinet/tcpip.h b/cpukit/libnetworking/netinet/tcpip.h index b8634bfd15..0b136633b7 100644 --- a/cpukit/libnetworking/netinet/tcpip.h +++ b/cpukit/libnetworking/netinet/tcpip.h @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,6 +27,10 @@ * SUCH DAMAGE. * * @(#)tcpip.h 8.1 (Berkeley) 6/10/93 + * $FreeBSD: src/sys/netinet/tcpip.h,v 1.12.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $ + */ + +/* * $Id$ */ @@ -41,19 +41,9 @@ * Tcp+ip header, after ip options removed. */ struct tcpiphdr { - struct ipovly ti_i; /* overlaid ip structure */ - struct tcphdr ti_t; /* tcp header */ -}; -#ifdef notyet -/* - * Tcp+ip header, after ip options removed but including TCP options. - */ -struct full_tcpiphdr { - struct ipovly ti_i; /* overlaid ip structure */ + struct ipovly ti_i; /* overlaid ip structure */ struct tcphdr ti_t; /* tcp header */ - char ti_o[TCP_MAXOLEN]; /* space for tcp options */ }; -#endif /* notyet */ #define ti_next ti_i.ih_next #define ti_prev ti_i.ih_prev #define ti_x1 ti_i.ih_x1 |