From 787f51f5b34083c246310bd80eaa93e5c539de76 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Tue, 6 Jun 2017 11:08:16 +0200
Subject: Do not include <sys/ioctl.h> in kernel-space

Update #2833.
---
 c/src/lib/libbsp/arm/atsam/network/if_atsam.c                    | 1 -
 c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c         | 2 +-
 c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c        | 2 +-
 c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c | 1 -
 c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c        | 1 -
 c/src/libchip/network/i82586.c                                   | 1 -
 cpukit/libcsupport/include/rtems/libio.h                         | 2 +-
 cpukit/libcsupport/src/termios.c                                 | 1 +
 cpukit/libfs/src/imfs/imfs_fifo.c                                | 2 ++
 cpukit/libfs/src/pipe/fifo.c                                     | 1 +
 cpukit/libmisc/shell/main_ifconfig.c                             | 1 +
 cpukit/libnetworking/net/if.c                                    | 2 +-
 cpukit/libnetworking/net/if_ethersubr.c                          | 2 +-
 cpukit/libnetworking/net/if_loop.c                               | 2 +-
 cpukit/libnetworking/net/if_ppp.c                                | 3 ++-
 cpukit/libnetworking/net/ppp_tty.c                               | 2 +-
 cpukit/libnetworking/net/route.c                                 | 2 +-
 cpukit/libnetworking/netinet/in.c                                | 2 +-
 cpukit/libnetworking/netinet/in_pcb.c                            | 2 +-
 cpukit/libnetworking/netinet/ip_mroute.c                         | 2 +-
 cpukit/libnetworking/rtems/rtems_bsdnet_internal.h               | 2 +-
 cpukit/libnetworking/rtems/rtems_dhcp.c                          | 2 +-
 cpukit/libnetworking/rtems/rtems_dhcp_failsafe.c                 | 2 +-
 cpukit/libnetworking/rtems/rtems_glue.c                          | 2 +-
 cpukit/libnetworking/rtems/rtems_showifstat.c                    | 2 +-
 testsuites/sptests/spfifo04/init.c                               | 1 +
 testsuites/sptests/spfifo05/init.c                               | 1 +
 27 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/c/src/lib/libbsp/arm/atsam/network/if_atsam.c b/c/src/lib/libbsp/arm/atsam/network/if_atsam.c
index 9a66912ec6..7e7e0e6faf 100644
--- a/c/src/lib/libbsp/arm/atsam/network/if_atsam.c
+++ b/c/src/lib/libbsp/arm/atsam/network/if_atsam.c
@@ -46,7 +46,6 @@
 #include <rtems/rtems_mii_ioctl.h>
 
 #include <sys/types.h>
-#include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c b/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c
index 23fca30c46..04c09e8ac8 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c
+++ b/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c
@@ -76,9 +76,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.13.8.1 2005/04/29 11:28:56 kent Exp $")
 #include <sys/device.h>
 #endif
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
+#include <sys/sockio.h>
 
 #ifndef __rtems__
 #include <machine/bus.h>
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c b/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c
index 96d0bf4a27..a083b3978b 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c
@@ -57,7 +57,7 @@
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <errno.h>
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c b/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c
index fbabe98598..85d5d0c56a 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c
@@ -44,7 +44,6 @@
 
 /* #include <sys/queue.h> */
 
-#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>             /* SIOCADDMULTI, SIOC...     */
 #include <net/if.h>
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c
index 25be33959c..50cd633d69 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c
@@ -61,7 +61,6 @@
 
 /* #include <sys/queue.h> */
 
-#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>             /* SIOCADDMULTI, SIOC...     */
 #include <net/if.h>
diff --git a/c/src/libchip/network/i82586.c b/c/src/libchip/network/i82586.c
index c06ed5f263..8cb8140d18 100644
--- a/c/src/libchip/network/i82586.c
+++ b/c/src/libchip/network/i82586.c
@@ -161,7 +161,6 @@ Mode of operation:
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
-#include <sys/ioctl.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h
index d0824b4e85..4669cb52e1 100644
--- a/cpukit/libcsupport/include/rtems/libio.h
+++ b/cpukit/libcsupport/include/rtems/libio.h
@@ -27,7 +27,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
+#include <sys/ioccom.h>
 #include <sys/statvfs.h>
 #include <sys/uio.h>
 
diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c
index f310cb05ba..a22ae95719 100644
--- a/cpukit/libcsupport/src/termios.c
+++ b/cpukit/libcsupport/src/termios.c
@@ -31,6 +31,7 @@
 #include <termios.h>
 #include <unistd.h>
 #include <sys/fcntl.h>
+#include <sys/filio.h>
 #include <sys/ttycom.h>
 
 #include <rtems/termiostypes.h>
diff --git a/cpukit/libfs/src/imfs/imfs_fifo.c b/cpukit/libfs/src/imfs/imfs_fifo.c
index d84429d6fe..d6c2187055 100644
--- a/cpukit/libfs/src/imfs/imfs_fifo.c
+++ b/cpukit/libfs/src/imfs/imfs_fifo.c
@@ -19,6 +19,8 @@
 
 #include "imfs.h"
 
+#include <sys/filio.h>
+
 #define JNODE2PIPE(_jnode)  ( ((IMFS_fifo_t *)(_jnode))->pipe )
 
 #define LIBIO2PIPE(_iop)  ( JNODE2PIPE((IMFS_jnode_t *)(_iop)->pathinfo.node_access) )
diff --git a/cpukit/libfs/src/pipe/fifo.c b/cpukit/libfs/src/pipe/fifo.c
index 104ecb5d9d..49694d9953 100644
--- a/cpukit/libfs/src/pipe/fifo.c
+++ b/cpukit/libfs/src/pipe/fifo.c
@@ -19,6 +19,7 @@
 #endif
 
 #include <sys/param.h>
+#include <sys/filio.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/cpukit/libmisc/shell/main_ifconfig.c b/cpukit/libmisc/shell/main_ifconfig.c
index 004018a44c..c19048f14f 100644
--- a/cpukit/libmisc/shell/main_ifconfig.c
+++ b/cpukit/libmisc/shell/main_ifconfig.c
@@ -17,6 +17,7 @@
 
 #include <netinet/in.h>
 #include <sys/types.h>
+#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <net/if.h>
diff --git a/cpukit/libnetworking/net/if.c b/cpukit/libnetworking/net/if.c
index d0da62af39..740bb90700 100644
--- a/cpukit/libnetworking/net/if.c
+++ b/cpukit/libnetworking/net/if.c
@@ -44,7 +44,7 @@
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/kernel.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <errno.h>
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
diff --git a/cpukit/libnetworking/net/if_ethersubr.c b/cpukit/libnetworking/net/if_ethersubr.c
index a98241a84f..0b87632318 100644
--- a/cpukit/libnetworking/net/if_ethersubr.c
+++ b/cpukit/libnetworking/net/if_ethersubr.c
@@ -50,7 +50,7 @@
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <errno.h>
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
diff --git a/cpukit/libnetworking/net/if_loop.c b/cpukit/libnetworking/net/if_loop.c
index 9ddcc81323..48cf014418 100644
--- a/cpukit/libnetworking/net/if_loop.c
+++ b/cpukit/libnetworking/net/if_loop.c
@@ -52,7 +52,7 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <errno.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/time.h>
 
 #include <net/if.h>
diff --git a/cpukit/libnetworking/net/if_ppp.c b/cpukit/libnetworking/net/if_ppp.c
index 4549910d6c..9284f6d302 100644
--- a/cpukit/libnetworking/net/if_ppp.c
+++ b/cpukit/libnetworking/net/if_ppp.c
@@ -95,7 +95,8 @@
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
+#include <sys/sockio.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/malloc.h>
diff --git a/cpukit/libnetworking/net/ppp_tty.c b/cpukit/libnetworking/net/ppp_tty.c
index e68124cd7c..140a7e6baa 100644
--- a/cpukit/libnetworking/net/ppp_tty.c
+++ b/cpukit/libnetworking/net/ppp_tty.c
@@ -87,7 +87,7 @@
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
 #include <sys/file.h>
 #include <sys/kernel.h>
 
diff --git a/cpukit/libnetworking/net/route.c b/cpukit/libnetworking/net/route.c
index b04649c6f4..bb9f3ff844 100644
--- a/cpukit/libnetworking/net/route.c
+++ b/cpukit/libnetworking/net/route.c
@@ -45,7 +45,7 @@
 #include <sys/socketvar.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/cpukit/libnetworking/netinet/in.c b/cpukit/libnetworking/netinet/in.c
index a23d4f598c..372252cddf 100644
--- a/cpukit/libnetworking/netinet/in.c
+++ b/cpukit/libnetworking/netinet/in.c
@@ -37,7 +37,7 @@
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <errno.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
diff --git a/cpukit/libnetworking/netinet/in_pcb.c b/cpukit/libnetworking/netinet/in_pcb.c
index 1cd9c9244b..bba5528a6c 100644
--- a/cpukit/libnetworking/netinet/in_pcb.c
+++ b/cpukit/libnetworking/netinet/in_pcb.c
@@ -43,7 +43,7 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <errno.h>
 #include <sys/time.h>
 #include <sys/proc.h>
diff --git a/cpukit/libnetworking/netinet/ip_mroute.c b/cpukit/libnetworking/netinet/ip_mroute.c
index 92b4bb7f2f..5fc3023ee3 100644
--- a/cpukit/libnetworking/netinet/ip_mroute.c
+++ b/cpukit/libnetworking/netinet/ip_mroute.c
@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/syslog.h>
 #include <net/if.h>
 #include <net/route.h>
diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
index fffe1b2e21..9608996078 100644
--- a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
+++ b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
@@ -35,7 +35,7 @@ typedef	__uintptr_t		vm_size_t;
 #include <sys/cdefs.h>
 
 #include <sys/time.h>
-#include <sys/ioctl.h>
+#include <sys/ioccom.h>
 
 struct mdproc {
 	int	md_flags;
diff --git a/cpukit/libnetworking/rtems/rtems_dhcp.c b/cpukit/libnetworking/rtems/rtems_dhcp.c
index 74ea870497..5f5515c847 100644
--- a/cpukit/libnetworking/rtems/rtems_dhcp.c
+++ b/cpukit/libnetworking/rtems/rtems_dhcp.c
@@ -82,7 +82,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/param.h>		/* for MAXHOSTNAMELEN */
 #include <sys/systm.h>
 #include <sys/socketvar.h>	/* for socreat() soclose() */
diff --git a/cpukit/libnetworking/rtems/rtems_dhcp_failsafe.c b/cpukit/libnetworking/rtems/rtems_dhcp_failsafe.c
index 46a411bc55..acdec137fc 100644
--- a/cpukit/libnetworking/rtems/rtems_dhcp_failsafe.c
+++ b/cpukit/libnetworking/rtems/rtems_dhcp_failsafe.c
@@ -63,7 +63,7 @@
 #include <rtems/rtems_dhcp_failsafe.h>
 
 struct  proc;                   /* Unused parameter of some functions. */
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/socket.h>
 #include <net/route.h>
 #include <netinet/in.h>         /* for sockaddr_in */
diff --git a/cpukit/libnetworking/rtems/rtems_glue.c b/cpukit/libnetworking/rtems/rtems_glue.c
index ac75fb0b5d..939b858dc7 100644
--- a/cpukit/libnetworking/rtems/rtems_glue.c
+++ b/cpukit/libnetworking/rtems/rtems_glue.c
@@ -24,7 +24,7 @@
 #include <sys/sockio.h>
 #include <sys/callout.h>
 #include <sys/proc.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/systm.h>
 #include <net/if.h>
 #include <net/route.h>
diff --git a/cpukit/libnetworking/rtems/rtems_showifstat.c b/cpukit/libnetworking/rtems/rtems_showifstat.c
index 2e06a8ce5c..a936cf7458 100644
--- a/cpukit/libnetworking/rtems/rtems_showifstat.c
+++ b/cpukit/libnetworking/rtems/rtems_showifstat.c
@@ -9,7 +9,7 @@
 #include <sys/sysctl.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
+#include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/testsuites/sptests/spfifo04/init.c b/testsuites/sptests/spfifo04/init.c
index 5e2d1c12ee..157b45c786 100644
--- a/testsuites/sptests/spfifo04/init.c
+++ b/testsuites/sptests/spfifo04/init.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/testsuites/sptests/spfifo05/init.c b/testsuites/sptests/spfifo05/init.c
index a5ce3130a5..ab3ed66f96 100644
--- a/testsuites/sptests/spfifo05/init.c
+++ b/testsuites/sptests/spfifo05/init.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-- 
cgit v1.2.3