summaryrefslogtreecommitdiffstats
path: root/freebsd/sys/netipsec
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2017-05-23 13:18:31 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2017-06-08 13:19:54 +0200
commit02373194fe0be1ef82db419bedbf9d6ffd31dc93 (patch)
treef151591d23221ec221c57496d07f7fba8dff137a /freebsd/sys/netipsec
parentUpdate scripts to include support for input devices - USB Keyboard, USB mouse... (diff)
downloadrtems-libbsd-02373194fe0be1ef82db419bedbf9d6ffd31dc93.tar.bz2
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.
Diffstat (limited to 'freebsd/sys/netipsec')
-rw-r--r--freebsd/sys/netipsec/ipsec.c4
-rw-r--r--freebsd/sys/netipsec/ipsec_input.c4
-rw-r--r--freebsd/sys/netipsec/ipsec_mbuf.c2
-rw-r--r--freebsd/sys/netipsec/ipsec_mod.c2
-rw-r--r--freebsd/sys/netipsec/ipsec_output.c4
-rw-r--r--freebsd/sys/netipsec/ipsec_pcb.c2
-rw-r--r--freebsd/sys/netipsec/key.c4
-rw-r--r--freebsd/sys/netipsec/key_debug.c2
-rw-r--r--freebsd/sys/netipsec/keysock.c4
-rw-r--r--freebsd/sys/netipsec/subr_ipsec.c2
-rw-r--r--freebsd/sys/netipsec/udpencap.c2
-rw-r--r--freebsd/sys/netipsec/xform_ah.c2
-rw-r--r--freebsd/sys/netipsec/xform_esp.c2
-rw-r--r--freebsd/sys/netipsec/xform_ipcomp.c2
-rw-r--r--freebsd/sys/netipsec/xform_tcp.c2
15 files changed, 20 insertions, 20 deletions
diff --git a/freebsd/sys/netipsec/ipsec.c b/freebsd/sys/netipsec/ipsec.c
index 20aad0b6..4b44a8ce 100644
--- a/freebsd/sys/netipsec/ipsec.c
+++ b/freebsd/sys/netipsec/ipsec.c
@@ -40,7 +40,7 @@
#include <rtems/bsd/local/opt_inet6.h>
#include <rtems/bsd/local/opt_ipsec.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
@@ -49,7 +49,7 @@
#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
-#include <rtems/bsd/sys/errno.h>
+#include <sys/errno.h>
#include <sys/hhook.h>
#include <sys/time.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/netipsec/ipsec_input.c b/freebsd/sys/netipsec/ipsec_input.c
index 50e7d646..62143c79 100644
--- a/freebsd/sys/netipsec/ipsec_input.c
+++ b/freebsd/sys/netipsec/ipsec_input.c
@@ -49,14 +49,14 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_inet6.h>
#include <rtems/bsd/local/opt_ipsec.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/domain.h>
#include <sys/protosw.h>
#include <sys/socket.h>
-#include <rtems/bsd/sys/errno.h>
+#include <sys/errno.h>
#include <sys/hhook.h>
#include <sys/syslog.h>
diff --git a/freebsd/sys/netipsec/ipsec_mbuf.c b/freebsd/sys/netipsec/ipsec_mbuf.c
index d81c0deb..ba0321ef 100644
--- a/freebsd/sys/netipsec/ipsec_mbuf.c
+++ b/freebsd/sys/netipsec/ipsec_mbuf.c
@@ -32,7 +32,7 @@
* IPsec-specific mbuf routines.
*/
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
diff --git a/freebsd/sys/netipsec/ipsec_mod.c b/freebsd/sys/netipsec/ipsec_mod.c
index 78b9f1da..32f6cc4c 100644
--- a/freebsd/sys/netipsec/ipsec_mod.c
+++ b/freebsd/sys/netipsec/ipsec_mod.c
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <rtems/bsd/sys/lock.h>
diff --git a/freebsd/sys/netipsec/ipsec_output.c b/freebsd/sys/netipsec/ipsec_output.c
index 3403b0bc..b68d61a1 100644
--- a/freebsd/sys/netipsec/ipsec_output.c
+++ b/freebsd/sys/netipsec/ipsec_output.c
@@ -37,13 +37,13 @@
#include <rtems/bsd/local/opt_ipsec.h>
#include <rtems/bsd/local/opt_sctp.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/domain.h>
#include <sys/protosw.h>
#include <sys/socket.h>
-#include <rtems/bsd/sys/errno.h>
+#include <sys/errno.h>
#include <sys/hhook.h>
#include <sys/syslog.h>
diff --git a/freebsd/sys/netipsec/ipsec_pcb.c b/freebsd/sys/netipsec/ipsec_pcb.c
index 21a8182d..5822185a 100644
--- a/freebsd/sys/netipsec/ipsec_pcb.c
+++ b/freebsd/sys/netipsec/ipsec_pcb.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_inet6.h>
#include <rtems/bsd/local/opt_ipsec.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <rtems/bsd/sys/lock.h>
diff --git a/freebsd/sys/netipsec/key.c b/freebsd/sys/netipsec/key.c
index 5d3a612d..bf4eb9d0 100644
--- a/freebsd/sys/netipsec/key.c
+++ b/freebsd/sys/netipsec/key.c
@@ -41,7 +41,7 @@
#include <rtems/bsd/local/opt_ipsec.h>
#include <sys/types.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/fnv_hash.h>
@@ -55,7 +55,7 @@
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/sysctl.h>
-#include <rtems/bsd/sys/errno.h>
+#include <sys/errno.h>
#include <sys/proc.h>
#include <sys/queue.h>
#include <sys/refcount.h>
diff --git a/freebsd/sys/netipsec/key_debug.c b/freebsd/sys/netipsec/key_debug.c
index 51ac1fdc..362b5529 100644
--- a/freebsd/sys/netipsec/key_debug.c
+++ b/freebsd/sys/netipsec/key_debug.c
@@ -38,7 +38,7 @@
#include <rtems/bsd/local/opt_ipsec.h>
#endif
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#ifdef _KERNEL
#include <sys/systm.h>
#include <rtems/bsd/sys/lock.h>
diff --git a/freebsd/sys/netipsec/keysock.c b/freebsd/sys/netipsec/keysock.c
index 21430347..12fecfa5 100644
--- a/freebsd/sys/netipsec/keysock.c
+++ b/freebsd/sys/netipsec/keysock.c
@@ -37,9 +37,9 @@
/* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
#include <sys/types.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/domain.h>
-#include <rtems/bsd/sys/errno.h>
+#include <sys/errno.h>
#include <sys/kernel.h>
#include <rtems/bsd/sys/lock.h>
#include <sys/malloc.h>
diff --git a/freebsd/sys/netipsec/subr_ipsec.c b/freebsd/sys/netipsec/subr_ipsec.c
index ff830564..cf6b317b 100644
--- a/freebsd/sys/netipsec/subr_ipsec.c
+++ b/freebsd/sys/netipsec/subr_ipsec.c
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <rtems/bsd/sys/lock.h>
diff --git a/freebsd/sys/netipsec/udpencap.c b/freebsd/sys/netipsec/udpencap.c
index fd2ca444..fbf9ae6e 100644
--- a/freebsd/sys/netipsec/udpencap.c
+++ b/freebsd/sys/netipsec/udpencap.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_inet.h>
#include <rtems/bsd/local/opt_ipsec.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <rtems/bsd/sys/lock.h>
diff --git a/freebsd/sys/netipsec/xform_ah.c b/freebsd/sys/netipsec/xform_ah.c
index 5dd41282..d08089c8 100644
--- a/freebsd/sys/netipsec/xform_ah.c
+++ b/freebsd/sys/netipsec/xform_ah.c
@@ -41,7 +41,7 @@
#include <rtems/bsd/local/opt_inet.h>
#include <rtems/bsd/local/opt_inet6.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netipsec/xform_esp.c b/freebsd/sys/netipsec/xform_esp.c
index bf98dc03..ebd18234 100644
--- a/freebsd/sys/netipsec/xform_esp.c
+++ b/freebsd/sys/netipsec/xform_esp.c
@@ -40,7 +40,7 @@
#include <rtems/bsd/local/opt_inet.h>
#include <rtems/bsd/local/opt_inet6.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netipsec/xform_ipcomp.c b/freebsd/sys/netipsec/xform_ipcomp.c
index f5a7aad4..6b11d800 100644
--- a/freebsd/sys/netipsec/xform_ipcomp.c
+++ b/freebsd/sys/netipsec/xform_ipcomp.c
@@ -34,7 +34,7 @@
#include <rtems/bsd/local/opt_inet.h>
#include <rtems/bsd/local/opt_inet6.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <rtems/bsd/sys/lock.h>
diff --git a/freebsd/sys/netipsec/xform_tcp.c b/freebsd/sys/netipsec/xform_tcp.c
index 81b4f1d0..7306a50e 100644
--- a/freebsd/sys/netipsec/xform_tcp.c
+++ b/freebsd/sys/netipsec/xform_tcp.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_inet6.h>
#include <rtems/bsd/local/opt_ipsec.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <rtems/bsd/sys/lock.h>