From ddbfa05096238518660f9e1f519836ceaac6ecf4 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Wed, 2 Mar 2011 14:39:32 +0000
Subject: Use <sys/queue.h> instead of <rtems/bsd/sys/queue.h.

---
 cpukit/libnetworking/kern/kern_subr.c           | 2 +-
 cpukit/libnetworking/kern/kern_sysctl.c         | 2 +-
 cpukit/libnetworking/kern/uipc_socket.c         | 2 +-
 cpukit/libnetworking/kern/uipc_socket2.c        | 2 +-
 cpukit/libnetworking/netinet/if_ether.c         | 2 +-
 cpukit/libnetworking/netinet/in.c               | 2 +-
 cpukit/libnetworking/netinet/in_pcb.c           | 2 +-
 cpukit/libnetworking/netinet/in_pcb.h           | 2 +-
 cpukit/libnetworking/netinet/in_proto.c         | 2 +-
 cpukit/libnetworking/netinet/in_rmx.c           | 2 +-
 cpukit/libnetworking/netinet/in_var.h           | 2 +-
 cpukit/libnetworking/netinet/ip_divert.c        | 2 +-
 cpukit/libnetworking/netinet/ip_fw.c            | 2 +-
 cpukit/libnetworking/netinet/ip_mroute.c        | 2 +-
 cpukit/libnetworking/netinet/ip_output.c        | 2 +-
 cpukit/libnetworking/netinet/raw_ip.c           | 2 +-
 cpukit/libnetworking/netinet/tcp_input.c        | 2 +-
 cpukit/libnetworking/netinet/tcp_output.c       | 2 +-
 cpukit/libnetworking/netinet/tcp_subr.c         | 2 +-
 cpukit/libnetworking/netinet/tcp_timer.c        | 2 +-
 cpukit/libnetworking/netinet/tcp_usrreq.c       | 2 +-
 cpukit/libnetworking/netinet/udp_usrreq.c       | 2 +-
 cpukit/libnetworking/rtems/rtems_showicmpstat.c | 2 +-
 cpukit/libnetworking/rtems/rtems_showifstat.c   | 2 +-
 cpukit/libnetworking/rtems/rtems_showipstat.c   | 2 +-
 cpukit/libnetworking/rtems/rtems_showmbuf.c     | 2 +-
 cpukit/libnetworking/rtems/rtems_showroute.c    | 2 +-
 cpukit/libnetworking/rtems/rtems_showtcpstat.c  | 2 +-
 cpukit/libnetworking/rtems/rtems_showudpstat.c  | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/cpukit/libnetworking/kern/kern_subr.c b/cpukit/libnetworking/kern/kern_subr.c
index 1e25a6496f..3823f607a1 100644
--- a/cpukit/libnetworking/kern/kern_subr.c
+++ b/cpukit/libnetworking/kern/kern_subr.c
@@ -43,7 +43,7 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 
 int
 uiomove(void *cp, int n, struct uio *uio)
diff --git a/cpukit/libnetworking/kern/kern_sysctl.c b/cpukit/libnetworking/kern/kern_sysctl.c
index fe917cf631..993c20f5d2 100644
--- a/cpukit/libnetworking/kern/kern_sysctl.c
+++ b/cpukit/libnetworking/kern/kern_sysctl.c
@@ -52,7 +52,7 @@
 #include <sys/sx.h>
 #include <sys/sysproto.h>
 #else
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 
 #include <stdio.h>                                /* for snprintf() */
 size_t   strlcpy(char *, const char *, size_t);
diff --git a/cpukit/libnetworking/kern/uipc_socket.c b/cpukit/libnetworking/kern/uipc_socket.c
index 4b0874d4fc..47fe7194fd 100644
--- a/cpukit/libnetworking/kern/uipc_socket.c
+++ b/cpukit/libnetworking/kern/uipc_socket.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/file.h>
diff --git a/cpukit/libnetworking/kern/uipc_socket2.c b/cpukit/libnetworking/kern/uipc_socket2.c
index 319096722a..fa5487fd84 100644
--- a/cpukit/libnetworking/kern/uipc_socket2.c
+++ b/cpukit/libnetworking/kern/uipc_socket2.c
@@ -44,7 +44,7 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/file.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
diff --git a/cpukit/libnetworking/netinet/if_ether.c b/cpukit/libnetworking/netinet/if_ether.c
index 984077eab4..2742c3b678 100644
--- a/cpukit/libnetworking/netinet/if_ether.c
+++ b/cpukit/libnetworking/netinet/if_ether.c
@@ -48,7 +48,7 @@
 
 #include <sys/param.h>
 #include <sys/kernel.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
diff --git a/cpukit/libnetworking/netinet/in.c b/cpukit/libnetworking/netinet/in.c
index 40121c8f33..a23d4f598c 100644
--- a/cpukit/libnetworking/netinet/in.c
+++ b/cpukit/libnetworking/netinet/in.c
@@ -35,7 +35,7 @@
 #endif
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <errno.h>
diff --git a/cpukit/libnetworking/netinet/in_pcb.c b/cpukit/libnetworking/netinet/in_pcb.c
index 9fddb929c9..00cdcd2f2e 100644
--- a/cpukit/libnetworking/netinet/in_pcb.c
+++ b/cpukit/libnetworking/netinet/in_pcb.c
@@ -39,7 +39,7 @@
 #endif
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
diff --git a/cpukit/libnetworking/netinet/in_pcb.h b/cpukit/libnetworking/netinet/in_pcb.h
index 0e0c1b3dc5..f3a3cc178d 100644
--- a/cpukit/libnetworking/netinet/in_pcb.h
+++ b/cpukit/libnetworking/netinet/in_pcb.h
@@ -37,7 +37,7 @@
 #ifndef _NETINET_IN_PCB_H_
 #define _NETINET_IN_PCB_H_
 
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 
 /*
  * Common structure pcb for internet protocol implementation.
diff --git a/cpukit/libnetworking/netinet/in_proto.c b/cpukit/libnetworking/netinet/in_proto.c
index b34ab63077..a79dbebf11 100644
--- a/cpukit/libnetworking/netinet/in_proto.c
+++ b/cpukit/libnetworking/netinet/in_proto.c
@@ -37,7 +37,7 @@
 #include "opt_tcpdebug.h"
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/cpukit/libnetworking/netinet/in_rmx.c b/cpukit/libnetworking/netinet/in_rmx.c
index e221a26809..e21ae4a59c 100644
--- a/cpukit/libnetworking/netinet/in_rmx.c
+++ b/cpukit/libnetworking/netinet/in_rmx.c
@@ -50,7 +50,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/mbuf.h>
diff --git a/cpukit/libnetworking/netinet/in_var.h b/cpukit/libnetworking/netinet/in_var.h
index cc51a0df45..3d555803f8 100644
--- a/cpukit/libnetworking/netinet/in_var.h
+++ b/cpukit/libnetworking/netinet/in_var.h
@@ -34,7 +34,7 @@
 #ifndef _NETINET_IN_VAR_H_
 #define _NETINET_IN_VAR_H_
 
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #if !defined(__rtems__)
 #include <sys/fnv_hash.h>
 #endif
diff --git a/cpukit/libnetworking/netinet/ip_divert.c b/cpukit/libnetworking/netinet/ip_divert.c
index 3647b52dd2..6e480989ad 100644
--- a/cpukit/libnetworking/netinet/ip_divert.c
+++ b/cpukit/libnetworking/netinet/ip_divert.c
@@ -38,7 +38,7 @@
 #endif
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/cpukit/libnetworking/netinet/ip_fw.c b/cpukit/libnetworking/netinet/ip_fw.c
index 82c52b21f2..a371cdbab7 100644
--- a/cpukit/libnetworking/netinet/ip_fw.c
+++ b/cpukit/libnetworking/netinet/ip_fw.c
@@ -31,7 +31,7 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/cpukit/libnetworking/netinet/ip_mroute.c b/cpukit/libnetworking/netinet/ip_mroute.c
index d8a1bb5baa..fe0bcc2a8c 100644
--- a/cpukit/libnetworking/netinet/ip_mroute.c
+++ b/cpukit/libnetworking/netinet/ip_mroute.c
@@ -19,7 +19,7 @@
 #include "opt_mrouting.h"
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
diff --git a/cpukit/libnetworking/netinet/ip_output.c b/cpukit/libnetworking/netinet/ip_output.c
index 32b4e1b2af..510f9d046b 100644
--- a/cpukit/libnetworking/netinet/ip_output.c
+++ b/cpukit/libnetworking/netinet/ip_output.c
@@ -41,7 +41,7 @@
 #define _IP_VHL
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
diff --git a/cpukit/libnetworking/netinet/raw_ip.c b/cpukit/libnetworking/netinet/raw_ip.c
index a3305f296a..12a05aa6a4 100644
--- a/cpukit/libnetworking/netinet/raw_ip.c
+++ b/cpukit/libnetworking/netinet/raw_ip.c
@@ -43,7 +43,7 @@
 #include "opt_mac.h"
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/cpukit/libnetworking/netinet/tcp_input.c b/cpukit/libnetworking/netinet/tcp_input.c
index 7cb199cb85..6d75c5c841 100644
--- a/cpukit/libnetworking/netinet/tcp_input.c
+++ b/cpukit/libnetworking/netinet/tcp_input.c
@@ -38,7 +38,7 @@
 
 #ifndef TUBA_INCLUDE
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
diff --git a/cpukit/libnetworking/netinet/tcp_output.c b/cpukit/libnetworking/netinet/tcp_output.c
index 43cb68ac7d..d5f0c311b4 100644
--- a/cpukit/libnetworking/netinet/tcp_output.c
+++ b/cpukit/libnetworking/netinet/tcp_output.c
@@ -37,7 +37,7 @@
 #include "opt_tcpdebug.h"
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
diff --git a/cpukit/libnetworking/netinet/tcp_subr.c b/cpukit/libnetworking/netinet/tcp_subr.c
index fd3de80f73..e3c6f9323c 100644
--- a/cpukit/libnetworking/netinet/tcp_subr.c
+++ b/cpukit/libnetworking/netinet/tcp_subr.c
@@ -41,7 +41,7 @@
 #include "opt_tcpdebug.h"
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/cpukit/libnetworking/netinet/tcp_timer.c b/cpukit/libnetworking/netinet/tcp_timer.c
index 51bed30958..174368780c 100644
--- a/cpukit/libnetworking/netinet/tcp_timer.c
+++ b/cpukit/libnetworking/netinet/tcp_timer.c
@@ -38,7 +38,7 @@
 
 #ifndef TUBA_INCLUDE
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
diff --git a/cpukit/libnetworking/netinet/tcp_usrreq.c b/cpukit/libnetworking/netinet/tcp_usrreq.c
index 6926b06eb3..0771f7e4e0 100644
--- a/cpukit/libnetworking/netinet/tcp_usrreq.c
+++ b/cpukit/libnetworking/netinet/tcp_usrreq.c
@@ -41,7 +41,7 @@
 #include "opt_tcpdebug.h"
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
diff --git a/cpukit/libnetworking/netinet/udp_usrreq.c b/cpukit/libnetworking/netinet/udp_usrreq.c
index f09531d810..8b56c28bec 100644
--- a/cpukit/libnetworking/netinet/udp_usrreq.c
+++ b/cpukit/libnetworking/netinet/udp_usrreq.c
@@ -35,7 +35,7 @@
 #endif
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
diff --git a/cpukit/libnetworking/rtems/rtems_showicmpstat.c b/cpukit/libnetworking/rtems/rtems_showicmpstat.c
index 15c19c012c..c554fa70a1 100644
--- a/cpukit/libnetworking/rtems/rtems_showicmpstat.c
+++ b/cpukit/libnetworking/rtems/rtems_showicmpstat.c
@@ -7,7 +7,7 @@
 #endif
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
diff --git a/cpukit/libnetworking/rtems/rtems_showifstat.c b/cpukit/libnetworking/rtems/rtems_showifstat.c
index 4d8befa6bd..17722093fb 100644
--- a/cpukit/libnetworking/rtems/rtems_showifstat.c
+++ b/cpukit/libnetworking/rtems/rtems_showifstat.c
@@ -7,7 +7,7 @@
 #endif
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
diff --git a/cpukit/libnetworking/rtems/rtems_showipstat.c b/cpukit/libnetworking/rtems/rtems_showipstat.c
index 651521eb97..75eabca2c1 100644
--- a/cpukit/libnetworking/rtems/rtems_showipstat.c
+++ b/cpukit/libnetworking/rtems/rtems_showipstat.c
@@ -7,7 +7,7 @@
 #endif
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
diff --git a/cpukit/libnetworking/rtems/rtems_showmbuf.c b/cpukit/libnetworking/rtems/rtems_showmbuf.c
index 7934983cab..a4404a5a6c 100644
--- a/cpukit/libnetworking/rtems/rtems_showmbuf.c
+++ b/cpukit/libnetworking/rtems/rtems_showmbuf.c
@@ -7,7 +7,7 @@
 #endif
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
diff --git a/cpukit/libnetworking/rtems/rtems_showroute.c b/cpukit/libnetworking/rtems/rtems_showroute.c
index a1eca66978..e30c0eaccf 100644
--- a/cpukit/libnetworking/rtems/rtems_showroute.c
+++ b/cpukit/libnetworking/rtems/rtems_showroute.c
@@ -7,7 +7,7 @@
 #endif
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
diff --git a/cpukit/libnetworking/rtems/rtems_showtcpstat.c b/cpukit/libnetworking/rtems/rtems_showtcpstat.c
index 9e09445e0c..15612878ef 100644
--- a/cpukit/libnetworking/rtems/rtems_showtcpstat.c
+++ b/cpukit/libnetworking/rtems/rtems_showtcpstat.c
@@ -7,7 +7,7 @@
 #endif
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
diff --git a/cpukit/libnetworking/rtems/rtems_showudpstat.c b/cpukit/libnetworking/rtems/rtems_showudpstat.c
index 77a3bca654..d47534d964 100644
--- a/cpukit/libnetworking/rtems/rtems_showudpstat.c
+++ b/cpukit/libnetworking/rtems/rtems_showudpstat.c
@@ -7,7 +7,7 @@
 #endif
 
 #include <sys/param.h>
-#include <rtems/bsd/sys/queue.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-- 
cgit v1.2.3