Update due to Newlib 2017-06-07 changes

The following files are now provided by Newlib:

  * arpa/inet.h
  * net/if.h
  * netinet/in.h
  * netinet/tcp.h
  * sys/socket.h
  * sys/uio.h
  * sys/un.h

The <sys/param.h> and <sys/cpuset.h> are now compatible enough to be
used directly.

Update #2833.

16 files changed, 10 insertions, 1095 deletions

diff --git a/freebsd/sys/sys/_bitset.h b/freebsd/sys/sys/_bitset.h
deleted file mode 100644
index 2f5301d5..00000000
--- a/freebsd/sys/sys/_bitset.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
- * All rights reserved.
- *
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _SYS__BITSET_H_
-#define	_SYS__BITSET_H_
-
-/*
- * Macros addressing word and bit within it, tuned to make compiler
- * optimize cases when SETSIZE fits into single machine word.
- */
-#define	_BITSET_BITS		(sizeof(long) * 8)
-
-#define	__howmany(x, y)	(((x) + ((y) - 1)) / (y))
-
-#define	__bitset_words(_s)	(__howmany(_s, _BITSET_BITS))
-
-#define	BITSET_DEFINE(t, _s)						\
-struct t {								\
-        long    __bits[__bitset_words((_s))];				\
-}
-
-/*
- * Helper to declare a bitset without it's size being a constant.
- *
- * Sadly we cannot declare a bitset struct with '__bits[]', because it's
- * the only member of the struct and the compiler complains.
- */
-#define BITSET_DEFINE_VAR(t)	BITSET_DEFINE(t, 1)
-
-#endif /* !_SYS__BITSET_H_ */
diff --git a/freebsd/sys/sys/_cpuset.h b/freebsd/sys/sys/_cpuset.h
deleted file mode 100644
index 1ddafac2..00000000
--- a/freebsd/sys/sys/_cpuset.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2008,	Jeffrey Roberson <jeff@freebsd.org>
- * All rights reserved.
- *
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _SYS__CPUSET_H_
-#define	_SYS__CPUSET_H_
-
-#include <sys/_bitset.h>
-
-#ifdef _KERNEL
-#define	CPU_SETSIZE	MAXCPU
-#endif
-
-#define	CPU_MAXSIZE	256
-
-#ifndef	CPU_SETSIZE
-#define	CPU_SETSIZE	CPU_MAXSIZE
-#endif
-
-BITSET_DEFINE(_cpuset, CPU_SETSIZE);
-typedef struct _cpuset cpuset_t;
-
-#endif /* !_SYS__CPUSET_H_ */
diff --git a/freebsd/sys/sys/_sockaddr_storage.h b/freebsd/sys/sys/_sockaddr_storage.h
deleted file mode 100644
index 189e16d8..00000000
--- a/freebsd/sys/sys/_sockaddr_storage.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $FreeBSD$
- */
-
-#ifndef _SYS__SOCKADDR_STORAGE_H_
-#define	_SYS__SOCKADDR_STORAGE_H_
-
-/*
- * RFC 2553: protocol-independent placeholder for socket addresses
- */
-#define	_SS_MAXSIZE	128U
-#define	_SS_ALIGNSIZE	(sizeof(__int64_t))
-#define	_SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(unsigned char) - \
-			    sizeof(sa_family_t))
-#define	_SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(unsigned char) - \
-			    sizeof(sa_family_t) - _SS_PAD1SIZE - _SS_ALIGNSIZE)
-
-struct sockaddr_storage {
-	unsigned char	ss_len;		/* address length */
-	sa_family_t	ss_family;	/* address family */
-	char		__ss_pad1[_SS_PAD1SIZE];
-	__int64_t	__ss_align;	/* force desired struct alignment */
-	char		__ss_pad2[_SS_PAD2SIZE];
-};
-
-#endif /* !_SYS__SOCKADDR_STORAGE_H_ */
diff --git a/freebsd/sys/sys/acl.h b/freebsd/sys/sys/acl.h
index 21b3e381..9806a54a 100644
--- a/freebsd/sys/sys/acl.h
+++ b/freebsd/sys/sys/acl.h
@@ -36,7 +36,7 @@
 #ifndef _SYS_ACL_H_
 #define	_SYS_ACL_H_
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <vm/uma.h>
 
diff --git a/freebsd/sys/sys/bitset.h b/freebsd/sys/sys/bitset.h
deleted file mode 100644
index 723c39b0..00000000
--- a/freebsd/sys/sys/bitset.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*-
- * Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
- * All rights reserved.
- *
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _SYS_BITSET_H_
-#define	_SYS_BITSET_H_
-
-#define	__bitset_mask(_s, n)						\
-	(1L << ((__bitset_words((_s)) == 1) ?				\
-	    (__size_t)(n) : ((n) % _BITSET_BITS)))
-
-#define	__bitset_word(_s, n)						\
-	((__bitset_words((_s)) == 1) ? 0 : ((n) / _BITSET_BITS))
-
-#define	BIT_CLR(_s, n, p)						\
-	((p)->__bits[__bitset_word(_s, n)] &= ~__bitset_mask((_s), (n)))
-
-#define	BIT_COPY(_s, f, t)	(void)(*(t) = *(f))
-
-#define	BIT_ISSET(_s, n, p)						\
-	((((p)->__bits[__bitset_word(_s, n)] & __bitset_mask((_s), (n))) != 0))
-
-#define	BIT_SET(_s, n, p)						\
-	((p)->__bits[__bitset_word(_s, n)] |= __bitset_mask((_s), (n)))
-
-#define	BIT_ZERO(_s, p) do {						\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		(p)->__bits[__i] = 0L;					\
-} while (0)
-
-#define	BIT_FILL(_s, p) do {						\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		(p)->__bits[__i] = -1L;					\
-} while (0)
-
-#define	BIT_SETOF(_s, n, p) do {					\
-	BIT_ZERO(_s, p);						\
-	(p)->__bits[__bitset_word(_s, n)] = __bitset_mask((_s), (n));	\
-} while (0)
-
-/* Is p empty. */
-#define	BIT_EMPTY(_s, p) __extension__ ({				\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		if ((p)->__bits[__i])					\
-			break;						\
-	__i == __bitset_words((_s));					\
-})
-
-/* Is p full set. */
-#define	BIT_ISFULLSET(_s, p) __extension__ ({				\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		if ((p)->__bits[__i] != (long)-1)			\
-			break;						\
-	__i == __bitset_words((_s));					\
-})
-
-/* Is c a subset of p. */
-#define	BIT_SUBSET(_s, p, c) __extension__ ({				\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		if (((c)->__bits[__i] &					\
-		    (p)->__bits[__i]) !=				\
-		    (c)->__bits[__i])					\
-			break;						\
-	__i == __bitset_words((_s));					\
-})
-
-/* Are there any common bits between b & c? */
-#define	BIT_OVERLAP(_s, p, c) __extension__ ({				\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		if (((c)->__bits[__i] &					\
-		    (p)->__bits[__i]) != 0)				\
-			break;						\
-	__i != __bitset_words((_s));					\
-})
-
-/* Compare two sets, returns 0 if equal 1 otherwise. */
-#define	BIT_CMP(_s, p, c) __extension__ ({				\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		if (((c)->__bits[__i] !=				\
-		    (p)->__bits[__i]))					\
-			break;						\
-	__i != __bitset_words((_s));					\
-})
-
-#define	BIT_OR(_s, d, s) do {						\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		(d)->__bits[__i] |= (s)->__bits[__i];			\
-} while (0)
-
-#define	BIT_AND(_s, d, s) do {						\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		(d)->__bits[__i] &= (s)->__bits[__i];			\
-} while (0)
-
-#define	BIT_NAND(_s, d, s) do {						\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		(d)->__bits[__i] &= ~(s)->__bits[__i];			\
-} while (0)
-
-#define	BIT_CLR_ATOMIC(_s, n, p)					\
-	atomic_clear_long(&(p)->__bits[__bitset_word(_s, n)],		\
-	    __bitset_mask((_s), n))
-
-#define	BIT_SET_ATOMIC(_s, n, p)					\
-	atomic_set_long(&(p)->__bits[__bitset_word(_s, n)],		\
-	    __bitset_mask((_s), n))
-
-#define	BIT_SET_ATOMIC_ACQ(_s, n, p)					\
-	atomic_set_acq_long(&(p)->__bits[__bitset_word(_s, n)],		\
-	    __bitset_mask((_s), n))
-
-/* Convenience functions catering special cases. */
-#define	BIT_AND_ATOMIC(_s, d, s) do {					\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		atomic_clear_long(&(d)->__bits[__i],			\
-		    ~(s)->__bits[__i]);					\
-} while (0)
-
-#define	BIT_OR_ATOMIC(_s, d, s) do {					\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		atomic_set_long(&(d)->__bits[__i],			\
-		    (s)->__bits[__i]);					\
-} while (0)
-
-#define	BIT_COPY_STORE_REL(_s, f, t) do {				\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		atomic_store_rel_long(&(t)->__bits[__i],		\
-		    (f)->__bits[__i]);					\
-} while (0)
-
-#define	BIT_FFS(_s, p) __extension__ ({					\
-	__size_t __i;							\
-	int __bit;							\
-									\
-	__bit = 0;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++) {		\
-		if ((p)->__bits[__i] != 0) {				\
-			__bit = ffsl((p)->__bits[__i]);			\
-			__bit += __i * _BITSET_BITS;			\
-			break;						\
-		}							\
-	}								\
-	__bit;								\
-})
-
-#define	BIT_COUNT(_s, p) __extension__ ({				\
-	__size_t __i;							\
-	int __count;							\
-									\
-	__count = 0;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		__count += __bitcountl((p)->__bits[__i]);		\
-	__count;							\
-})
-
-#define	BITSET_T_INITIALIZER(x)						\
-	{ .__bits = { x } }
-
-#define	BITSET_FSET(n)							\
-	[ 0 ... ((n) - 1) ] = (-1L)
-
-/*
- * Dynamically allocate a bitset.
- */
-#define BITSET_ALLOC(_s, mt, mf)					\
-	malloc(__bitset_words(_s) * sizeof(long), mt, (mf))
-
-#endif /* !_SYS_BITSET_H_ */
diff --git a/freebsd/sys/sys/bitstring.h b/freebsd/sys/sys/bitstring.h
index 8fd9b25a..18c91878 100644
--- a/freebsd/sys/sys/bitstring.h
+++ b/freebsd/sys/sys/bitstring.h
@@ -68,9 +68,6 @@
 #endif
 
 #include <sys/types.h>
-#ifdef __rtems__
-#include <machine/bitstring.h>
-#endif /* __rtems__ */
 
 typedef	unsigned long bitstr_t;
 
diff --git a/freebsd/sys/sys/capsicum.h b/freebsd/sys/sys/capsicum.h
index a5e64925..ae466952 100644
--- a/freebsd/sys/sys/capsicum.h
+++ b/freebsd/sys/sys/capsicum.h
@@ -40,7 +40,7 @@
 #define	_SYS_CAPSICUM_H_
 
 #include <sys/cdefs.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <sys/caprights.h>
 #include <sys/file.h>
diff --git a/freebsd/sys/sys/fail.h b/freebsd/sys/sys/fail.h
index 45499af2..34aa593f 100644
--- a/freebsd/sys/sys/fail.h
+++ b/freebsd/sys/sys/fail.h
@@ -32,7 +32,7 @@
 #ifndef _SYS_FAIL_H_
 #define _SYS_FAIL_H_
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/cdefs.h>
 #include <sys/linker_set.h>
 #include <sys/queue.h>
diff --git a/freebsd/sys/sys/ktr.h b/freebsd/sys/sys/ktr.h
index e25cfe03..07d7c45b 100644
--- a/freebsd/sys/sys/ktr.h
+++ b/freebsd/sys/sys/ktr.h
@@ -48,7 +48,7 @@
 
 #ifndef LOCORE
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/_cpuset.h>
 
 struct ktr_entry {
diff --git a/freebsd/sys/sys/lockstat.h b/freebsd/sys/sys/lockstat.h
index 705f3bb5..64745052 100644
--- a/freebsd/sys/sys/lockstat.h
+++ b/freebsd/sys/sys/lockstat.h
@@ -34,7 +34,7 @@
 
 #ifdef _KERNEL
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/sdt.h>
 
diff --git a/freebsd/sys/sys/malloc.h b/freebsd/sys/sys/malloc.h
index c59456de..c93439f3 100644
--- a/freebsd/sys/sys/malloc.h
+++ b/freebsd/sys/sys/malloc.h
@@ -35,7 +35,7 @@
 #ifndef _SYS_MALLOC_H_
 #define	_SYS_MALLOC_H_
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
diff --git a/freebsd/sys/sys/smp.h b/freebsd/sys/sys/smp.h
index 96a3fe59..d98b7ecf 100644
--- a/freebsd/sys/sys/smp.h
+++ b/freebsd/sys/sys/smp.h
@@ -16,7 +16,7 @@
 
 #ifndef LOCORE
 
-#include <rtems/bsd/sys/cpuset.h>
+#include <sys/cpuset.h>
 #include <sys/queue.h>
 
 /*
diff --git a/freebsd/sys/sys/socket.h b/freebsd/sys/sys/socket.h
deleted file mode 100644
index 0ef59dc4..00000000
--- a/freebsd/sys/sys/socket.h
+++ /dev/null
@@ -1,712 +0,0 @@
-/*-
- * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $FreeBSD$
- */
-
-#ifndef _SYS_SOCKET_H_
-#define	_SYS_SOCKET_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <sys/_iovec.h>
-#include <machine/_align.h>
-
-/*
- * Definitions related to sockets: types, address families, options.
- */
-
-/*
- * Data types.
- */
-#if __BSD_VISIBLE
-#ifndef _GID_T_DECLARED
-typedef	__gid_t		gid_t;
-#define	_GID_T_DECLARED
-#endif
-
-#ifndef _OFF_T_DECLARED
-typedef	__off_t		off_t;
-#define	_OFF_T_DECLARED
-#endif
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-#endif
-
-#ifndef _SA_FAMILY_T_DECLARED
-typedef	__sa_family_t	sa_family_t;
-#define	_SA_FAMILY_T_DECLARED
-#endif
-
-#ifndef _SOCKLEN_T_DECLARED
-typedef	__socklen_t	socklen_t;
-#define	_SOCKLEN_T_DECLARED
-#endif
- 
-#ifndef _SSIZE_T_DECLARED
-typedef	__ssize_t	ssize_t;
-#define	_SSIZE_T_DECLARED
-#endif
-
-#if __BSD_VISIBLE 
-#ifndef _UID_T_DECLARED
-typedef	__uid_t		uid_t;
-#define	_UID_T_DECLARED
-#endif
-#endif
-
-#ifndef _UINT32_T_DECLARED
-typedef	__uint32_t	uint32_t;
-#define	_UINT32_T_DECLARED
-#endif
-
-#ifndef _UINTPTR_T_DECLARED
-typedef	__uintptr_t	uintptr_t;
-#define	_UINTPTR_T_DECLARED
-#endif
-
-/*
- * Types
- */
-#define	SOCK_STREAM	1		/* stream socket */
-#define	SOCK_DGRAM	2		/* datagram socket */
-#define	SOCK_RAW	3		/* raw-protocol interface */
-#if __BSD_VISIBLE
-#define	SOCK_RDM	4		/* reliably-delivered message */
-#endif
-#define	SOCK_SEQPACKET	5		/* sequenced packet stream */
-
-#if __BSD_VISIBLE
-/*
- * Creation flags, OR'ed into socket() and socketpair() type argument.
- */
-#define	SOCK_CLOEXEC	0x10000000
-#define	SOCK_NONBLOCK	0x20000000
-#endif
-
-/*
- * Option flags per-socket.
- */
-#define	SO_DEBUG	0x0001		/* turn on debugging info recording */
-#define	SO_ACCEPTCONN	0x0002		/* socket has had listen() */
-#define	SO_REUSEADDR	0x0004		/* allow local address reuse */
-#define	SO_KEEPALIVE	0x0008		/* keep connections alive */
-#define	SO_DONTROUTE	0x0010		/* just use interface addresses */
-#define	SO_BROADCAST	0x0020		/* permit sending of broadcast msgs */
-#if __BSD_VISIBLE
-#define	SO_USELOOPBACK	0x0040		/* bypass hardware when possible */
-#endif
-#define	SO_LINGER	0x0080		/* linger on close if data present */
-#define	SO_OOBINLINE	0x0100		/* leave received OOB data in line */
-#if __BSD_VISIBLE
-#define	SO_REUSEPORT	0x0200		/* allow local address & port reuse */
-#define	SO_TIMESTAMP	0x0400		/* timestamp received dgram traffic */
-#define	SO_NOSIGPIPE	0x0800		/* no SIGPIPE from EPIPE */
-#define	SO_ACCEPTFILTER	0x1000		/* there is an accept filter */
-#define	SO_BINTIME	0x2000		/* timestamp received dgram traffic */
-#endif
-#define	SO_NO_OFFLOAD	0x4000		/* socket cannot be offloaded */
-#define	SO_NO_DDP	0x8000		/* disable direct data placement */
-
-/*
- * Additional options, not kept in so_options.
- */
-#define	SO_SNDBUF	0x1001		/* send buffer size */
-#define	SO_RCVBUF	0x1002		/* receive buffer size */
-#define	SO_SNDLOWAT	0x1003		/* send low-water mark */
-#define	SO_RCVLOWAT	0x1004		/* receive low-water mark */
-#define	SO_SNDTIMEO	0x1005		/* send timeout */
-#define	SO_RCVTIMEO	0x1006		/* receive timeout */
-#define	SO_ERROR	0x1007		/* get error status and clear */
-#define	SO_TYPE		0x1008		/* get socket type */
-#if __BSD_VISIBLE
-#define	SO_LABEL	0x1009		/* socket's MAC label */
-#define	SO_PEERLABEL	0x1010		/* socket's peer's MAC label */
-#define	SO_LISTENQLIMIT	0x1011		/* socket's backlog limit */
-#define	SO_LISTENQLEN	0x1012		/* socket's complete queue length */
-#define	SO_LISTENINCQLEN	0x1013	/* socket's incomplete queue length */
-#define	SO_SETFIB	0x1014		/* use this FIB to route */
-#define	SO_USER_COOKIE	0x1015		/* user cookie (dummynet etc.) */
-#define	SO_PROTOCOL	0x1016		/* get socket protocol (Linux name) */
-#define	SO_PROTOTYPE	SO_PROTOCOL	/* alias for SO_PROTOCOL (SunOS name) */
-#define	SO_TS_CLOCK	0x1017		/* clock type used for SO_TIMESTAMP */
-#define	SO_MAX_PACING_RATE	0x1018	/* socket's max TX pacing rate (Linux name) */
-#endif
-
-#if __BSD_VISIBLE
-#define	SO_TS_REALTIME_MICRO	0	/* microsecond resolution, realtime */
-#define	SO_TS_BINTIME		1	/* sub-nanosecond resolution, realtime */
-#define	SO_TS_REALTIME		2	/* nanosecond resolution, realtime */
-#define	SO_TS_MONOTONIC		3	/* nanosecond resolution, monotonic */
-#define	SO_TS_DEFAULT		SO_TS_REALTIME_MICRO
-#define	SO_TS_CLOCK_MAX		SO_TS_MONOTONIC
-#endif
-
-/*
- * Space reserved for new socket options added by third-party vendors.
- * This range applies to all socket option levels.  New socket options
- * in FreeBSD should always use an option value less than SO_VENDOR.
- */
-#if __BSD_VISIBLE
-#define	SO_VENDOR	0x80000000
-#endif
-
-/*
- * Structure used for manipulating linger option.
- */
-struct linger {
-	int	l_onoff;		/* option on/off */
-	int	l_linger;		/* linger time */
-};
-
-#if __BSD_VISIBLE
-struct accept_filter_arg {
-	char	af_name[16];
-	char	af_arg[256-16];
-};
-#endif
-
-/*
- * Level number for (get/set)sockopt() to apply to socket itself.
- */
-#define	SOL_SOCKET	0xffff		/* options for socket level */
-
-/*
- * Address families.
- */
-#define	AF_UNSPEC	0		/* unspecified */
-#if __BSD_VISIBLE
-#define	AF_LOCAL	AF_UNIX		/* local to host (pipes, portals) */
-#endif
-#define	AF_UNIX		1		/* standardized name for AF_LOCAL */
-#define	AF_INET		2		/* internetwork: UDP, TCP, etc. */
-#if __BSD_VISIBLE
-#define	AF_IMPLINK	3		/* arpanet imp addresses */
-#define	AF_PUP		4		/* pup protocols: e.g. BSP */
-#define	AF_CHAOS	5		/* mit CHAOS protocols */
-#define	AF_NETBIOS	6		/* SMB protocols */
-#define	AF_ISO		7		/* ISO protocols */
-#define	AF_OSI		AF_ISO
-#define	AF_ECMA		8		/* European computer manufacturers */
-#define	AF_DATAKIT	9		/* datakit protocols */
-#define	AF_CCITT	10		/* CCITT protocols, X.25 etc */
-#define	AF_SNA		11		/* IBM SNA */
-#define AF_DECnet	12		/* DECnet */
-#define AF_DLI		13		/* DEC Direct data link interface */
-#define AF_LAT		14		/* LAT */
-#define	AF_HYLINK	15		/* NSC Hyperchannel */
-#define	AF_APPLETALK	16		/* Apple Talk */
-#define	AF_ROUTE	17		/* Internal Routing Protocol */
-#define	AF_LINK		18		/* Link layer interface */
-#define	pseudo_AF_XTP	19		/* eXpress Transfer Protocol (no AF) */
-#define	AF_COIP		20		/* connection-oriented IP, aka ST II */
-#define	AF_CNT		21		/* Computer Network Technology */
-#define pseudo_AF_RTIP	22		/* Help Identify RTIP packets */
-#define	AF_IPX		23		/* Novell Internet Protocol */
-#define	AF_SIP		24		/* Simple Internet Protocol */
-#define	pseudo_AF_PIP	25		/* Help Identify PIP packets */
-#define	AF_ISDN		26		/* Integrated Services Digital Network*/
-#define	AF_E164		AF_ISDN		/* CCITT E.164 recommendation */
-#define	pseudo_AF_KEY	27		/* Internal key-management function */
-#endif
-#define	AF_INET6	28		/* IPv6 */
-#if __BSD_VISIBLE
-#define	AF_NATM		29		/* native ATM access */
-#define	AF_ATM		30		/* ATM */
-#define pseudo_AF_HDRCMPLT 31		/* Used by BPF to not rewrite headers
-					 * in interface output routine
-					 */
-#define	AF_NETGRAPH	32		/* Netgraph sockets */
-#define	AF_SLOW		33		/* 802.3ad slow protocol */
-#define	AF_SCLUSTER	34		/* Sitara cluster protocol */
-#define	AF_ARP		35
-#define	AF_BLUETOOTH	36		/* Bluetooth sockets */
-#define	AF_IEEE80211	37		/* IEEE 802.11 protocol */
-#define	AF_INET_SDP	40		/* OFED Socket Direct Protocol ipv4 */
-#define	AF_INET6_SDP	42		/* OFED Socket Direct Protocol ipv6 */
-#define	AF_MAX		42
-/*
- * When allocating a new AF_ constant, please only allocate
- * even numbered constants for FreeBSD until 134 as odd numbered AF_
- * constants 39-133 are now reserved for vendors.
- */
-#define AF_VENDOR00 39
-#define AF_VENDOR01 41
-#define AF_VENDOR02 43
-#define AF_VENDOR03 45
-#define AF_VENDOR04 47
-#define AF_VENDOR05 49
-#define AF_VENDOR06 51
-#define AF_VENDOR07 53
-#define AF_VENDOR08 55
-#define AF_VENDOR09 57
-#define AF_VENDOR10 59
-#define AF_VENDOR11 61
-#define AF_VENDOR12 63
-#define AF_VENDOR13 65
-#define AF_VENDOR14 67
-#define AF_VENDOR15 69
-#define AF_VENDOR16 71
-#define AF_VENDOR17 73
-#define AF_VENDOR18 75
-#define AF_VENDOR19 77
-#define AF_VENDOR20 79
-#define AF_VENDOR21 81
-#define AF_VENDOR22 83
-#define AF_VENDOR23 85
-#define AF_VENDOR24 87
-#define AF_VENDOR25 89
-#define AF_VENDOR26 91
-#define AF_VENDOR27 93
-#define AF_VENDOR28 95
-#define AF_VENDOR29 97
-#define AF_VENDOR30 99
-#define AF_VENDOR31 101
-#define AF_VENDOR32 103
-#define AF_VENDOR33 105
-#define AF_VENDOR34 107
-#define AF_VENDOR35 109
-#define AF_VENDOR36 111
-#define AF_VENDOR37 113
-#define AF_VENDOR38 115
-#define AF_VENDOR39 117
-#define AF_VENDOR40 119
-#define AF_VENDOR41 121
-#define AF_VENDOR42 123
-#define AF_VENDOR43 125
-#define AF_VENDOR44 127
-#define AF_VENDOR45 129
-#define AF_VENDOR46 131
-#define AF_VENDOR47 133
-#endif
-
-/*
- * Structure used by kernel to store most
- * addresses.
- */
-struct sockaddr {
-	unsigned char	sa_len;		/* total length */
-	sa_family_t	sa_family;	/* address family */
-	char		sa_data[14];	/* actually longer; address value */
-};
-#if __BSD_VISIBLE
-#define	SOCK_MAXADDRLEN	255		/* longest possible addresses */
-
-/*
- * Structure used by kernel to pass protocol
- * information in raw sockets.
- */
-struct sockproto {
-	unsigned short	sp_family;		/* address family */
-	unsigned short	sp_protocol;		/* protocol */
-};
-#endif
-
-#include <sys/_sockaddr_storage.h>
-
-#if __BSD_VISIBLE
-/*
- * Protocol families, same as address families for now.
- */
-#define	PF_UNSPEC	AF_UNSPEC
-#define	PF_LOCAL	AF_LOCAL
-#define	PF_UNIX		PF_LOCAL	/* backward compatibility */
-#define	PF_INET		AF_INET
-#define	PF_IMPLINK	AF_IMPLINK
-#define	PF_PUP		AF_PUP
-#define	PF_CHAOS	AF_CHAOS
-#define	PF_NETBIOS	AF_NETBIOS
-#define	PF_ISO		AF_ISO
-#define	PF_OSI		AF_ISO
-#define	PF_ECMA		AF_ECMA
-#define	PF_DATAKIT	AF_DATAKIT
-#define	PF_CCITT	AF_CCITT
-#define	PF_SNA		AF_SNA
-#define PF_DECnet	AF_DECnet
-#define PF_DLI		AF_DLI
-#define PF_LAT		AF_LAT
-#define	PF_HYLINK	AF_HYLINK
-#define	PF_APPLETALK	AF_APPLETALK
-#define	PF_ROUTE	AF_ROUTE
-#define	PF_LINK		AF_LINK
-#define	PF_XTP		pseudo_AF_XTP	/* really just proto family, no AF */
-#define	PF_COIP		AF_COIP
-#define	PF_CNT		AF_CNT
-#define	PF_SIP		AF_SIP
-#define	PF_IPX		AF_IPX
-#define PF_RTIP		pseudo_AF_RTIP	/* same format as AF_INET */
-#define PF_PIP		pseudo_AF_PIP
-#define	PF_ISDN		AF_ISDN
-#define	PF_KEY		pseudo_AF_KEY
-#define	PF_INET6	AF_INET6
-#define	PF_NATM		AF_NATM
-#define	PF_ATM		AF_ATM
-#define	PF_NETGRAPH	AF_NETGRAPH
-#define	PF_SLOW		AF_SLOW
-#define PF_SCLUSTER	AF_SCLUSTER
-#define	PF_ARP		AF_ARP
-#define	PF_BLUETOOTH	AF_BLUETOOTH
-#define	PF_IEEE80211	AF_IEEE80211
-#define	PF_INET_SDP	AF_INET_SDP
-#define	PF_INET6_SDP	AF_INET6_SDP
-
-#define	PF_MAX		AF_MAX
-
-/*
- * Definitions for network related sysctl, CTL_NET.
- *
- * Second level is protocol family.
- * Third level is protocol number.
- *
- * Further levels are defined by the individual families.
- */
-
-/*
- * PF_ROUTE - Routing table
- *
- * Three additional levels are defined:
- *	Fourth: address family, 0 is wildcard
- *	Fifth: type of info, defined below
- *	Sixth: flag(s) to mask with for NET_RT_FLAGS
- */
-#define NET_RT_DUMP	1		/* dump; may limit to a.f. */
-#define NET_RT_FLAGS	2		/* by flags, e.g. RESOLVING */
-#define NET_RT_IFLIST	3		/* survey interface list */
-#define	NET_RT_IFMALIST	4		/* return multicast address list */
-#define	NET_RT_IFLISTL	5		/* Survey interface list, using 'l'en
-					 * versions of msghdr structs. */
-#endif /* __BSD_VISIBLE */
-
-/*
- * Maximum queue length specifiable by listen.
- */
-#define	SOMAXCONN	128
-
-/*
- * Message header for recvmsg and sendmsg calls.
- * Used value-result for recvmsg, value only for sendmsg.
- */
-struct msghdr {
-	void		*msg_name;		/* optional address */
-	socklen_t	 msg_namelen;		/* size of address */
-	struct iovec	*msg_iov;		/* scatter/gather array */
-	int		 msg_iovlen;		/* # elements in msg_iov */
-	void		*msg_control;		/* ancillary data, see below */
-	socklen_t	 msg_controllen;	/* ancillary data buffer len */
-	int		 msg_flags;		/* flags on received message */
-};
-
-#define	MSG_OOB		 0x00000001	/* process out-of-band data */
-#define	MSG_PEEK	 0x00000002	/* peek at incoming message */
-#define	MSG_DONTROUTE	 0x00000004	/* send without using routing tables */
-#define	MSG_EOR		 0x00000008	/* data completes record */
-#define	MSG_TRUNC	 0x00000010	/* data discarded before delivery */
-#define	MSG_CTRUNC	 0x00000020	/* control data lost before delivery */
-#define	MSG_WAITALL	 0x00000040	/* wait for full request or error */
-#if __BSD_VISIBLE
-#define	MSG_DONTWAIT	 0x00000080	/* this message should be nonblocking */
-#define	MSG_EOF		 0x00000100	/* data completes connection */
-/*			 0x00000200	   unused */
-/*			 0x00000400	   unused */
-/*			 0x00000800	   unused */
-/*			 0x00001000	   unused */
-#define	MSG_NOTIFICATION 0x00002000	/* SCTP notification */
-#define	MSG_NBIO	 0x00004000	/* FIONBIO mode, used by fifofs */
-#define	MSG_COMPAT       0x00008000		/* used in sendit() */
-#endif
-#ifdef _KERNEL
-#define	MSG_SOCALLBCK    0x00010000	/* for use by socket callbacks - soreceive (TCP) */
-#endif
-#if __POSIX_VISIBLE >= 200809
-#define	MSG_NOSIGNAL	 0x00020000	/* do not generate SIGPIPE on EOF */
-#endif
-#if __BSD_VISIBLE
-#define	MSG_CMSG_CLOEXEC 0x00040000	/* make received fds close-on-exec */
-#define	MSG_WAITFORONE	 0x00080000	/* for recvmmsg() */
-#endif
-#ifdef _KERNEL
-#define	MSG_MORETOCOME	 0x00100000	/* additional data pending */
-#endif
-
-/*
- * Header for ancillary data objects in msg_control buffer.
- * Used for additional information with/about a datagram
- * not expressible by flags.  The format is a sequence
- * of message elements headed by cmsghdr structures.
- */
-struct cmsghdr {
-	socklen_t	cmsg_len;		/* data byte count, including hdr */
-	int		cmsg_level;		/* originating protocol */
-	int		cmsg_type;		/* protocol-specific type */
-/* followed by	u_char  cmsg_data[]; */
-};
-
-#if __BSD_VISIBLE
-/*
- * While we may have more groups than this, the cmsgcred struct must
- * be able to fit in an mbuf and we have historically supported a
- * maximum of 16 groups.
-*/
-#define CMGROUP_MAX 16
-
-/*
- * Credentials structure, used to verify the identity of a peer
- * process that has sent us a message. This is allocated by the
- * peer process but filled in by the kernel. This prevents the
- * peer from lying about its identity. (Note that cmcred_groups[0]
- * is the effective GID.)
- */
-struct cmsgcred {
-	pid_t	cmcred_pid;		/* PID of sending process */
-	uid_t	cmcred_uid;		/* real UID of sending process */
-	uid_t	cmcred_euid;		/* effective UID of sending process */
-	gid_t	cmcred_gid;		/* real GID of sending process */
-	short	cmcred_ngroups;		/* number or groups */
-	gid_t	cmcred_groups[CMGROUP_MAX];	/* groups */
-};
-
-/*
- * Socket credentials.
- */
-struct sockcred {
-	uid_t	sc_uid;			/* real user id */
-	uid_t	sc_euid;		/* effective user id */
-	gid_t	sc_gid;			/* real group id */
-	gid_t	sc_egid;		/* effective group id */
-	int	sc_ngroups;		/* number of supplemental groups */
-	gid_t	sc_groups[1];		/* variable length */
-};
-
-/*
- * Compute size of a sockcred structure with groups.
- */
-#define	SOCKCREDSIZE(ngrps) \
-	(sizeof(struct sockcred) + (sizeof(gid_t) * ((ngrps) - 1)))
-
-#endif /* __BSD_VISIBLE */
-
-/* given pointer to struct cmsghdr, return pointer to data */
-#define	CMSG_DATA(cmsg)		((unsigned char *)(cmsg) + \
-				 _ALIGN(sizeof(struct cmsghdr)))
-
-/* given pointer to struct cmsghdr, return pointer to next cmsghdr */
-#define	CMSG_NXTHDR(mhdr, cmsg)	\
-	((char *)(cmsg) == (char *)0 ? CMSG_FIRSTHDR(mhdr) : \
-	    ((char *)(cmsg) + _ALIGN(((struct cmsghdr *)(cmsg))->cmsg_len) + \
-	  _ALIGN(sizeof(struct cmsghdr)) > \
-	    (char *)(mhdr)->msg_control + (mhdr)->msg_controllen) ? \
-	    (struct cmsghdr *)0 : \
-	    (struct cmsghdr *)(void *)((char *)(cmsg) + \
-	    _ALIGN(((struct cmsghdr *)(cmsg))->cmsg_len)))
-
-/*
- * RFC 2292 requires to check msg_controllen, in case that the kernel returns
- * an empty list for some reasons.
- */
-#define	CMSG_FIRSTHDR(mhdr) \
-	((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
-	 (struct cmsghdr *)(mhdr)->msg_control : \
-	 (struct cmsghdr *)0)
-
-#if __BSD_VISIBLE
-/* RFC 2292 additions */
-#define	CMSG_SPACE(l)		(_ALIGN(sizeof(struct cmsghdr)) + _ALIGN(l))
-#define	CMSG_LEN(l)		(_ALIGN(sizeof(struct cmsghdr)) + (l))
-#endif
-
-#ifdef _KERNEL
-#define	CMSG_ALIGN(n)	_ALIGN(n)
-#endif
-
-/* "Socket"-level control message types: */
-#define	SCM_RIGHTS	0x01		/* access rights (array of int) */
-#if __BSD_VISIBLE
-#define	SCM_TIMESTAMP	0x02		/* timestamp (struct timeval) */
-#define	SCM_CREDS	0x03		/* process creds (struct cmsgcred) */
-#define	SCM_BINTIME	0x04		/* timestamp (struct bintime) */
-#define	SCM_REALTIME	0x05		/* timestamp (struct timespec) */
-#define	SCM_MONOTONIC	0x06		/* timestamp (struct timespec) */
-#endif
-
-#if __BSD_VISIBLE
-/*
- * 4.3 compat sockaddr, move to compat file later
- */
-struct osockaddr {
-	unsigned short sa_family;	/* address family */
-	char	sa_data[14];		/* up to 14 bytes of direct address */
-};
-
-/*
- * 4.3-compat message header (move to compat file later).
- */
-struct omsghdr {
-	char	*msg_name;		/* optional address */
-	int	msg_namelen;		/* size of address */
-	struct	iovec *msg_iov;		/* scatter/gather array */
-	int	msg_iovlen;		/* # elements in msg_iov */
-	char	*msg_accrights;		/* access rights sent/received */
-	int	msg_accrightslen;
-};
-#endif
-
-/*
- * howto arguments for shutdown(2), specified by Posix.1g.
- */
-#define	SHUT_RD		0		/* shut down the reading side */
-#define	SHUT_WR		1		/* shut down the writing side */
-#define	SHUT_RDWR	2		/* shut down both sides */
-
-#if __BSD_VISIBLE
-/* for SCTP */
-/* we cheat and use the SHUT_XX defines for these */
-#define PRU_FLUSH_RD     SHUT_RD
-#define PRU_FLUSH_WR     SHUT_WR
-#define PRU_FLUSH_RDWR   SHUT_RDWR
-#endif
-
-
-#if __BSD_VISIBLE
-/*
- * sendfile(2) header/trailer struct
- */
-struct sf_hdtr {
-	struct iovec *headers;	/* pointer to an array of header struct iovec's */
-	int hdr_cnt;		/* number of header iovec's */
-	struct iovec *trailers;	/* pointer to an array of trailer struct iovec's */
-	int trl_cnt;		/* number of trailer iovec's */
-};
-
-/*
- * Sendfile-specific flag(s)
- */
-#define	SF_NODISKIO     0x00000001
-#define	SF_MNOWAIT	0x00000002	/* obsolete */
-#define	SF_SYNC		0x00000004
-#define	SF_USER_READAHEAD	0x00000008
-#define	SF_NOCACHE	0x00000010
-#define	SF_FLAGS(rh, flags)	(((rh) << 16) | (flags))
-
-#ifdef _KERNEL
-#define	SF_READAHEAD(flags)	((flags) >> 16)
-#endif /* _KERNEL */
-
-/*
- * Sendmmsg/recvmmsg specific structure(s)
- */
-struct mmsghdr {
-	struct msghdr	msg_hdr;		/* message header */
-	ssize_t		msg_len;		/* message length */
-};
-#endif /* __BSD_VISIBLE */
-
-#ifndef	_KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	accept(int, struct sockaddr * __restrict, socklen_t * __restrict);
-int	bind(int, const struct sockaddr *, socklen_t);
-int	connect(int, const struct sockaddr *, socklen_t);
-#if __BSD_VISIBLE
-int	accept4(int, struct sockaddr * __restrict, socklen_t * __restrict, int);
-int	bindat(int, int, const struct sockaddr *, socklen_t);
-int	connectat(int, int, const struct sockaddr *, socklen_t);
-#endif
-int	getpeername(int, struct sockaddr * __restrict, socklen_t * __restrict);
-int	getsockname(int, struct sockaddr * __restrict, socklen_t * __restrict);
-int	getsockopt(int, int, int, void * __restrict, socklen_t * __restrict);
-int	listen(int, int);
-ssize_t	recv(int, void *, size_t, int);
-ssize_t	recvfrom(int, void *, size_t, int, struct sockaddr * __restrict, socklen_t * __restrict);
-ssize_t	recvmsg(int, struct msghdr *, int);
-#if __BSD_VISIBLE
-struct timespec;
-ssize_t	recvmmsg(int, struct mmsghdr * __restrict, size_t, int,
-    const struct timespec * __restrict);
-#endif
-ssize_t	send(int, const void *, size_t, int);
-ssize_t	sendto(int, const void *,
-	    size_t, int, const struct sockaddr *, socklen_t);
-ssize_t	sendmsg(int, const struct msghdr *, int);
-#if __BSD_VISIBLE
-int	sendfile(int, int, off_t, size_t, struct sf_hdtr *, off_t *, int);
-ssize_t	sendmmsg(int, struct mmsghdr * __restrict, size_t, int);
-int	setfib(int);
-#endif
-int	setsockopt(int, int, int, const void *, socklen_t);
-int	shutdown(int, int);
-int	sockatmark(int);
-int	socket(int, int, int);
-int	socketpair(int, int, int, int *);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#ifdef _KERNEL
-struct socket;
-
-struct tcpcb *so_sototcpcb(struct socket *so);
-struct inpcb *so_sotoinpcb(struct socket *so);
-struct sockbuf *so_sockbuf_snd(struct socket *);
-struct sockbuf *so_sockbuf_rcv(struct socket *);
-
-int so_state_get(const struct socket *);
-void so_state_set(struct socket *, int);
-
-int so_options_get(const struct socket *);
-void so_options_set(struct socket *, int);
-
-int so_error_get(const struct socket *);
-void so_error_set(struct socket *, int);
-
-int so_linger_get(const struct socket *);
-void so_linger_set(struct socket *, int);
-
-struct protosw *so_protosw_get(const struct socket *);
-void so_protosw_set(struct socket *, struct protosw *);
-
-void so_sorwakeup_locked(struct socket *so);
-void so_sowwakeup_locked(struct socket *so);
-
-void so_sorwakeup(struct socket *so);
-void so_sowwakeup(struct socket *so);
-
-void so_lock(struct socket *so);
-void so_unlock(struct socket *so);
-
-void so_listeners_apply_all(struct socket *so, void (*func)(struct socket *, void *), void *arg);
-
-#endif
-
-
-#endif /* !_SYS_SOCKET_H_ */
diff --git a/freebsd/sys/sys/sysproto.h b/freebsd/sys/sys/sysproto.h
index bdd20804..e73e37dd 100644
--- a/freebsd/sys/sys/sysproto.h
+++ b/freebsd/sys/sys/sysproto.h
@@ -10,7 +10,7 @@
 
 #include <sys/signal.h>
 #include <sys/acl.h>
-#include <rtems/bsd/sys/cpuset.h>
+#include <sys/cpuset.h>
 #include <sys/_ffcounter.h>
 #include <sys/_semaphore.h>
 #include <sys/ucontext.h>
diff --git a/freebsd/sys/sys/tty.h b/freebsd/sys/sys/tty.h
index a82aedf4..d6d6ee64 100644
--- a/freebsd/sys/sys/tty.h
+++ b/freebsd/sys/sys/tty.h
@@ -32,7 +32,7 @@
 #ifndef _SYS_TTY_H_
 #define	_SYS_TTY_H_
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <rtems/bsd/sys/lock.h>
 #include <sys/mutex.h>
diff --git a/freebsd/sys/sys/user.h b/freebsd/sys/sys/user.h
index 762841ee..077baf46 100644
--- a/freebsd/sys/sys/user.h
+++ b/freebsd/sys/sys/user.h
@@ -38,7 +38,7 @@
 #include <machine/pcb.h>
 #ifndef _KERNEL
 /* stuff that *used* to be included by user.h, or is now needed */
-#include <rtems/bsd/sys/errno.h>
+#include <sys/errno.h>
 #include <sys/time.h>
 #include <rtems/bsd/sys/resource.h>
 #include <sys/ucred.h>