move arc4random prototype to systm.h. more appropriate for most code

to include that than rdnvar.h. ok deraadt dlg

8 files changed, 9 insertions, 23 deletions

diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index f23534f9b94..f8194682993 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frag6.c,v 1.56 2014/10/14 09:52:26 mpi Exp $	*/
+/*	$OpenBSD: frag6.c,v 1.57 2014/11/18 02:37:31 tedu Exp $	*/
 /*	$KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $	*/
 
 /*
@@ -52,8 +52,6 @@
 #include <netinet/icmp6.h>
 #include <netinet/ip.h>		/* for ECN definitions */
 
-#include <dev/rndvar.h>
-
 /*
  * Define it to get a correct behavior on per-interface statistics.
  * You will need to perform an extra routing table lookup, per fragment,
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 9faae1dc100..f3f09cf791a 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_ifattach.c,v 1.74 2014/11/01 21:40:39 mpi Exp $	*/
+/*	$OpenBSD: in6_ifattach.c,v 1.75 2014/11/18 02:37:31 tedu Exp $	*/
 /*	$KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $	*/
 
 /*
@@ -58,8 +58,6 @@
 #include <netinet6/ip6_mroute.h>
 #endif
 
-#include <dev/rndvar.h>
-
 unsigned long in6_maxmtu = 0;
 
 int ip6_auto_linklocal = 1;	/* enable by default */
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 6fee3d159ce..d8dfd1084e8 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_pcb.c,v 1.65 2014/08/21 11:54:00 mpi Exp $	*/
+/*	$OpenBSD: in6_pcb.c,v 1.66 2014/11/18 02:37:31 tedu Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -125,8 +125,6 @@
  * External globals
  */
 
-#include <dev/rndvar.h>
-
 /*
  * Globals
  */
diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c
index 8c7de21d727..8c8f569215c 100644
--- a/sys/netinet6/ip6_id.c
+++ b/sys/netinet6/ip6_id.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_id.c,v 1.8 2010/02/08 12:16:02 jsing Exp $	*/
+/*	$OpenBSD: ip6_id.c,v 1.9 2014/11/18 02:37:31 tedu Exp $	*/
 /*	$NetBSD: ip6_id.c,v 1.7 2003/09/13 21:32:59 itojun Exp $	*/
 /*	$KAME: ip6_id.c,v 1.8 2003/09/06 13:41:06 itojun Exp $	*/
 
@@ -85,14 +85,13 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
+#include <sys/systm.h>
 
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 
-#include <dev/rndvar.h>
-
 struct randomtab {
 	const int	ru_bits; /* resulting bits */
 	const long	ru_out;	/* Time after wich will be reseeded */
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index 5b93ef99c93..1e0cc208b34 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mld6.c,v 1.38 2014/04/14 09:06:42 mpi Exp $	*/
+/*	$OpenBSD: mld6.c,v 1.39 2014/11/18 02:37:31 tedu Exp $	*/
 /*	$KAME: mld6.c,v 1.26 2001/02/16 14:50:35 itojun Exp $	*/
 
 /*
@@ -71,7 +71,6 @@
 #include <sys/socket.h>
 #include <sys/protosw.h>
 #include <sys/syslog.h>
-#include <dev/rndvar.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index d7a6e8c6dc2..088ff5ef64d 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6.c,v 1.124 2014/11/01 21:40:39 mpi Exp $	*/
+/*	$OpenBSD: nd6.c,v 1.125 2014/11/18 02:37:31 tedu Exp $	*/
 /*	$KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $	*/
 
 /*
@@ -45,7 +45,6 @@
 #include <sys/syslog.h>
 #include <sys/queue.h>
 #include <sys/task.h>
-#include <dev/rndvar.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index ab23d49e3cc..617ae667cd0 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6_nbr.c,v 1.83 2014/11/10 10:46:10 mpi Exp $	*/
+/*	$OpenBSD: nd6_nbr.c,v 1.84 2014/11/18 02:37:31 tedu Exp $	*/
 /*	$KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $	*/
 
 /*
@@ -56,8 +56,6 @@
 #include <netinet6/nd6.h>
 #include <netinet/icmp6.h>
 
-#include <dev/rndvar.h>
-
 #include "carp.h"
 #if NCARP > 0
 #include <netinet/ip_carp.h>
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index 331885d82b0..c809f2ce311 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6_rtr.c,v 1.89 2014/11/01 21:40:39 mpi Exp $	*/
+/*	$OpenBSD: nd6_rtr.c,v 1.90 2014/11/18 02:37:31 tedu Exp $	*/
 /*	$KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $	*/
 
 /*
@@ -43,7 +43,6 @@
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
 #include <sys/queue.h>
-#include <dev/rndvar.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
@@ -58,8 +57,6 @@
 #include <netinet6/nd6.h>
 #include <netinet/icmp6.h>
 
-#include <dev/rndvar.h>
-
 #define SDL(s)	((struct sockaddr_dl *)s)
 
 int rtpref(struct nd_defrouter *);