diff options
| author | tls <tls@NetBSD.org> | 2014-08-10 16:44:32 +0000 |
|---|---|---|
| committer | tls <tls@NetBSD.org> | 2014-08-10 16:44:32 +0000 |
| commit | a72ef11467f430f0cb27f4e6a8ad98db3d777dd9 (patch) | |
| tree | 24f8915da45fd4b2671f09d9c1303538474ff651 /sys/dev | |
| parent | df3948ca31a0d211dc4758be54656b813bd65bcf (diff) | |
Merge tls-earlyentropy branch into HEAD.
Diffstat (limited to 'sys/dev')
69 files changed, 324 insertions, 225 deletions
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index e1118af1f4b..5d6f157475b 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $NetBSD: wd.c,v 1.411 2014/07/25 08:34:27 dholland Exp $ */ +/* $NetBSD: wd.c,v 1.412 2014/08/10 16:44:35 tls Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.411 2014/07/25 08:34:27 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.412 2014/08/10 16:44:35 tls Exp $"); #include "opt_ata.h" @@ -409,7 +409,7 @@ out: disk_attach(&wd->sc_dk); wd->sc_wdc_bio.lp = wd->sc_dk.dk_label; rnd_attach_source(&wd->rnd_source, device_xname(wd->sc_dev), - RND_TYPE_DISK, 0); + RND_TYPE_DISK, RND_FLAG_DEFAULT); /* Discover wedges on this disk. */ dkwedge_discover(&wd->sc_dk); diff --git a/sys/dev/gpib/rd.c b/sys/dev/gpib/rd.c index f56eeb3c5f8..1bb60358e59 100644 --- a/sys/dev/gpib/rd.c +++ b/sys/dev/gpib/rd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rd.c,v 1.35 2014/07/25 08:10:36 dholland Exp $ */ +/* $NetBSD: rd.c,v 1.36 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.35 2014/07/25 08:10:36 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.36 2014/08/10 16:44:35 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -428,7 +428,7 @@ rdattach(device_t parent, device_t self, void *aux) * attach the device into the random source list */ rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_DISK, 0); + RND_TYPE_DISK, RND_FLAG_DEFAULT); } /* diff --git a/sys/dev/i2c/dbcool.c b/sys/dev/i2c/dbcool.c index ec66b1aceed..ed8bcf737a2 100644 --- a/sys/dev/i2c/dbcool.c +++ b/sys/dev/i2c/dbcool.c @@ -1,4 +1,4 @@ -/* $NetBSD: dbcool.c,v 1.40 2014/02/25 18:30:09 pooka Exp $ */ +/* $NetBSD: dbcool.c,v 1.41 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.40 2014/02/25 18:30:09 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.41 2014/08/10 16:44:35 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1606,6 +1606,7 @@ dbcool_setup_sensors(struct dbcool_softc *sc) sc->sc_sensor[i].units = ENVSYS_STEMP; sc->sc_sensor[i].state = ENVSYS_SINVALID; sc->sc_sensor[i].flags |= ENVSYS_FMONLIMITS; + sc->sc_sensor[i].flags |= ENVSYS_FHAS_ENTROPY; error = dbcool_attach_sensor(sc, i); break; case DBC_VOLT: @@ -1622,12 +1623,14 @@ dbcool_setup_sensors(struct dbcool_softc *sc) sc->sc_sensor[i].units = ENVSYS_SVOLTS_DC; sc->sc_sensor[i].state = ENVSYS_SINVALID; sc->sc_sensor[i].flags |= ENVSYS_FMONLIMITS; + sc->sc_sensor[i].flags |= ENVSYS_FHAS_ENTROPY; error = dbcool_attach_sensor(sc, i); break; case DBC_FAN: sc->sc_sensor[i].units = ENVSYS_SFANRPM; sc->sc_sensor[i].state = ENVSYS_SINVALID; sc->sc_sensor[i].flags |= ENVSYS_FMONLIMITS; + sc->sc_sensor[i].flags |= ENVSYS_FHAS_ENTROPY; error = dbcool_attach_sensor(sc, i); break; case DBC_VID: diff --git a/sys/dev/i2c/hytp14var.h b/sys/dev/i2c/hytp14var.h index 879baf592b2..282f37e2e3c 100644 --- a/sys/dev/i2c/hytp14var.h +++ b/sys/dev/i2c/hytp14var.h @@ -1,4 +1,4 @@ -/* $NetBSD: hytp14var.h,v 1.1 2014/05/18 11:46:23 kardel Exp $ */ +/* $NetBSD: hytp14var.h,v 1.2 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -68,6 +68,12 @@ struct hytp14_sensor { #endif /* * $Log: hytp14var.h,v $ + * Revision 1.2 2014/08/10 16:44:35 tls + * Merge tls-earlyentropy branch into HEAD. + * + * Revision 1.1.4.2 2014/08/10 06:54:51 tls + * Rebase. + * * Revision 1.1 2014/05/18 11:46:23 kardel * add HYT-221/271/939 humidity/temperature I2C sensor * extend envsys(4) framework by %rH (relative humidity) diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index 99938ed860d..8d3c5f4cced 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.326 2014/07/25 08:10:37 dholland Exp $ */ +/* $NetBSD: com.c,v 1.327 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.326 2014/07/25 08:10:37 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.327 2014/08/10 16:44:35 tls Exp $"); #include "opt_com.h" #include "opt_ddb.h" @@ -626,7 +626,7 @@ fifodone: #ifdef RND_COM rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_TTY, 0); + RND_TYPE_TTY, RND_FLAG_DEFAULT); #endif /* if there are no enable/disable functions, assume the device diff --git a/sys/dev/ic/cs89x0.c b/sys/dev/ic/cs89x0.c index e92714dc9c6..abb0efd315b 100644 --- a/sys/dev/ic/cs89x0.c +++ b/sys/dev/ic/cs89x0.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs89x0.c,v 1.33 2012/02/02 19:43:03 tls Exp $ */ +/* $NetBSD: cs89x0.c,v 1.34 2014/08/10 16:44:35 tls Exp $ */ /* * Copyright (c) 2004 Christopher Gilbert @@ -212,7 +212,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.33 2012/02/02 19:43:03 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.34 2014/08/10 16:44:35 tls Exp $"); #include "opt_inet.h" @@ -489,7 +489,7 @@ cs_attach(struct cs_softc *sc, u_int8_t *enaddr, int *media, ether_ifattach(ifp, sc->sc_enaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); sc->sc_cfgflags |= CFGFLG_ATTACHED; if (pmf_device_register1(sc->sc_dev, NULL, NULL, cs_shutdown)) diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c index a29cc3853d4..48eb263c85a 100644 --- a/sys/dev/ic/dp8390.c +++ b/sys/dev/ic/dp8390.c @@ -1,4 +1,4 @@ -/* $NetBSD: dp8390.c,v 1.80 2012/02/02 19:43:03 tls Exp $ */ +/* $NetBSD: dp8390.c,v 1.81 2014/08/10 16:44:35 tls Exp $ */ /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -14,7 +14,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.80 2012/02/02 19:43:03 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.81 2014/08/10 16:44:35 tls Exp $"); #include "opt_ipkdb.h" #include "opt_inet.h" @@ -154,7 +154,7 @@ dp8390_config(struct dp8390_softc *sc) ether_ifattach(ifp, sc->sc_enaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); /* The attach is successful. */ sc->sc_flags |= DP8390_ATTACHED; diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c index f7b4fbc8141..7042ca9dc37 100644 --- a/sys/dev/ic/elink3.c +++ b/sys/dev/ic/elink3.c @@ -1,4 +1,4 @@ -/* $NetBSD: elink3.c,v 1.134 2012/10/27 17:18:20 chs Exp $ */ +/* $NetBSD: elink3.c,v 1.135 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.134 2012/10/27 17:18:20 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.135 2014/08/10 16:44:35 tls Exp $"); #include "opt_inet.h" @@ -488,7 +488,7 @@ epconfig(struct ep_softc *sc, u_short chipset, u_int8_t *enaddr) GO_WINDOW(1); /* Window 1 is operating window */ rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); sc->tx_start_thresh = 20; /* probably a good starting point. */ diff --git a/sys/dev/ic/elinkxl.c b/sys/dev/ic/elinkxl.c index 278e196524d..b06ac79158a 100644 --- a/sys/dev/ic/elinkxl.c +++ b/sys/dev/ic/elinkxl.c @@ -1,4 +1,4 @@ -/* $NetBSD: elinkxl.c,v 1.115 2012/07/22 14:32:57 matt Exp $ */ +/* $NetBSD: elinkxl.c,v 1.116 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.115 2012/07/22 14:32:57 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.116 2014/08/10 16:44:35 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -437,7 +437,7 @@ ex_config(struct ex_softc *sc) /* TODO: set queues to 0 */ rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); if (pmf_device_register1(sc->sc_dev, NULL, NULL, ex_shutdown)) pmf_class_network_register(sc->sc_dev, &sc->sc_ethercom.ec_if); diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c index 271bb0dd85d..fa099b178d0 100644 --- a/sys/dev/ic/gem.c +++ b/sys/dev/ic/gem.c @@ -1,4 +1,4 @@ -/* $NetBSD: gem.c,v 1.101 2013/02/04 18:29:55 jdc Exp $ */ +/* $NetBSD: gem.c,v 1.102 2014/08/10 16:44:35 tls Exp $ */ /* * @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.101 2013/02/04 18:29:55 jdc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.102 2014/08/10 16:44:35 tls Exp $"); #include "opt_inet.h" @@ -581,7 +581,7 @@ gem_attach(struct gem_softc *sc, const uint8_t *enaddr) ether_set_ifflags_cb(&sc->sc_ethercom, gem_ifflags_cb); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); evcnt_attach_dynamic(&sc->sc_ev_intr, EVCNT_TYPE_INTR, NULL, device_xname(sc->sc_dev), "interrupts"); diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c index b96aeb1ad3a..6d5ca7ab741 100644 --- a/sys/dev/ic/hme.c +++ b/sys/dev/ic/hme.c @@ -1,4 +1,4 @@ -/* $NetBSD: hme.c,v 1.89 2012/07/22 14:32:57 matt Exp $ */ +/* $NetBSD: hme.c,v 1.90 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.89 2012/07/22 14:32:57 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.90 2014/08/10 16:44:35 tls Exp $"); /* #define HMEDEBUG */ @@ -315,7 +315,7 @@ hme_config(struct hme_softc *sc) "couldn't establish power handler\n"); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); callout_init(&sc->sc_tick_ch, 0); } diff --git a/sys/dev/ic/i82557.c b/sys/dev/ic/i82557.c index f5e4b2fa66b..2e73da81f0c 100644 --- a/sys/dev/ic/i82557.c +++ b/sys/dev/ic/i82557.c @@ -1,4 +1,4 @@ -/* $NetBSD: i82557.c,v 1.141 2013/09/12 20:40:46 martin Exp $ */ +/* $NetBSD: i82557.c,v 1.142 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.141 2013/09/12 20:40:46 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.142 2014/08/10 16:44:35 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -409,7 +409,7 @@ fxp_attach(struct fxp_softc *sc) if_attach(ifp); ether_ifattach(ifp, enaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); #ifdef FXP_EVENT_COUNTERS evcnt_attach_dynamic(&sc->sc_ev_txstall, EVCNT_TYPE_MISC, diff --git a/sys/dev/ic/lan9118.c b/sys/dev/ic/lan9118.c index 845eae2b130..e5fe6d61383 100644 --- a/sys/dev/ic/lan9118.c +++ b/sys/dev/ic/lan9118.c @@ -1,4 +1,4 @@ -/* $NetBSD: lan9118.c,v 1.16 2012/07/22 14:32:57 matt Exp $ */ +/* $NetBSD: lan9118.c,v 1.17 2014/08/10 16:44:35 tls Exp $ */ /* * Copyright (c) 2008 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lan9118.c,v 1.16 2012/07/22 14:32:57 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lan9118.c,v 1.17 2014/08/10 16:44:35 tls Exp $"); /* * The LAN9118 Family @@ -279,7 +279,7 @@ lan9118_attach(struct lan9118_softc *sc) callout_init(&sc->sc_tick, 0); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); return 0; } diff --git a/sys/dev/ic/lance.c b/sys/dev/ic/lance.c index 6308e2cc9f0..cbd764e8a63 100644 --- a/sys/dev/ic/lance.c +++ b/sys/dev/ic/lance.c @@ -1,4 +1,4 @@ -/* $NetBSD: lance.c,v 1.46 2012/02/02 19:43:03 tls Exp $ */ +/* $NetBSD: lance.c,v 1.47 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.46 2012/02/02 19:43:03 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.47 2014/08/10 16:44:35 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -255,7 +255,7 @@ lance_config(struct lance_softc *sc) M_WAITOK); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); } void diff --git a/sys/dev/ic/lemac.c b/sys/dev/ic/lemac.c index e2f9bcae703..3059d45ae43 100644 --- a/sys/dev/ic/lemac.c +++ b/sys/dev/ic/lemac.c @@ -1,4 +1,4 @@ -/* $NetBSD: lemac.c,v 1.41 2012/10/27 17:18:21 chs Exp $ */ +/* $NetBSD: lemac.c,v 1.42 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 1994, 1995, 1997 Matt Thomas <matt@3am-software.com> @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.41 2012/10/27 17:18:21 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.42 2014/08/10 16:44:35 tls Exp $"); #include "opt_inet.h" @@ -1012,7 +1012,7 @@ lemac_ifattach( ether_ifattach(ifp, sc->sc_enaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); ifmedia_init(&sc->sc_ifmedia, 0, lemac_ifmedia_change, diff --git a/sys/dev/ic/mb86950.c b/sys/dev/ic/mb86950.c index 359643e0309..8434497c5bf 100644 --- a/sys/dev/ic/mb86950.c +++ b/sys/dev/ic/mb86950.c @@ -1,4 +1,4 @@ -/* $NetBSD: mb86950.c,v 1.20 2012/10/27 17:18:21 chs Exp $ */ +/* $NetBSD: mb86950.c,v 1.21 2014/08/10 16:44:35 tls Exp $ */ /* * All Rights Reserved, Copyright (C) Fujitsu Limited 1995 @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.20 2012/10/27 17:18:21 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.21 2014/08/10 16:44:35 tls Exp $"); /* * Device driver for Fujitsu mb86950 based Ethernet cards. @@ -294,7 +294,7 @@ mb86950_config(struct mb86950_softc *sc, int *media, ether_ifattach(ifp, sc->sc_enaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); /* XXX No! This doesn't work - DLCR6 of the mb86950 is different diff --git a/sys/dev/ic/mb86960.c b/sys/dev/ic/mb86960.c index c3d2868edcd..dc33fdf455d 100644 --- a/sys/dev/ic/mb86960.c +++ b/sys/dev/ic/mb86960.c @@ -1,4 +1,4 @@ -/* $NetBSD: mb86960.c,v 1.79 2013/05/17 10:48:54 mbalmer Exp $ */ +/* $NetBSD: mb86960.c,v 1.80 2014/08/10 16:44:35 tls Exp $ */ /* * All Rights Reserved, Copyright (C) Fujitsu Limited 1995 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.79 2013/05/17 10:48:54 mbalmer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.80 2014/08/10 16:44:35 tls Exp $"); /* * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards. @@ -250,7 +250,7 @@ mb86960_config(struct mb86960_softc *sc, int *media, int nmedia, int defmedia) ether_ifattach(ifp, sc->sc_enaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); /* Print additional info when attached. */ aprint_normal_dev(sc->sc_dev, "Ethernet address %s\n", diff --git a/sys/dev/ic/mtd803.c b/sys/dev/ic/mtd803.c index 267198ac7a5..23618e4c1be 100644 --- a/sys/dev/ic/mtd803.c +++ b/sys/dev/ic/mtd803.c @@ -1,4 +1,4 @@ -/* $NetBSD: mtd803.c,v 1.28 2013/10/17 21:24:24 christos Exp $ */ +/* $NetBSD: mtd803.c,v 1.29 2014/08/10 16:44:35 tls Exp $ */ /*- * @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.28 2013/10/17 21:24:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.29 2014/08/10 16:44:35 tls Exp $"); #include <sys/param.h> @@ -177,7 +177,7 @@ mtd_config(struct mtd_softc *sc) /* Initialise random source */ rnd_attach_source(&sc->rnd_src, device_xname(sc->dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); /* Add shutdown hook to reset card when we reboot */ sc->sd_hook = shutdownhook_establish(mtd_shutdown, sc); diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c index 5a382666ade..876176006ad 100644 --- a/sys/dev/ic/pckbc.c +++ b/sys/dev/ic/pckbc.c @@ -1,4 +1,4 @@ -/* $NetBSD: pckbc.c,v 1.56 2014/01/11 20:17:56 jakllsch Exp $ */ +/* $NetBSD: pckbc.c,v 1.57 2014/08/10 16:44:35 tls Exp $ */ /* * Copyright (c) 2004 Ben Harris. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.56 2014/01/11 20:17:56 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.57 2014/08/10 16:44:35 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -268,7 +268,7 @@ pckbc_attach_slot(struct pckbc_softc *sc, pckbc_slot_t slot) if (child != NULL && t->t_slotdata[slot] != NULL) rnd_attach_source(&t->t_slotdata[slot]->rnd_source, - device_xname(child), RND_TYPE_TTY, 0); + device_xname(child), RND_TYPE_TTY, RND_FLAG_DEFAULT); return child != NULL; } diff --git a/sys/dev/ic/rtl8169.c b/sys/dev/ic/rtl8169.c index e03e972d481..af87400a304 100644 --- a/sys/dev/ic/rtl8169.c +++ b/sys/dev/ic/rtl8169.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtl8169.c,v 1.139 2013/05/10 14:55:08 tsutsui Exp $ */ +/* $NetBSD: rtl8169.c,v 1.140 2014/08/10 16:44:35 tls Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.139 2013/05/10 14:55:08 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.140 2014/08/10 16:44:35 tls Exp $"); /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */ /* @@ -862,7 +862,7 @@ re_attach(struct rtk_softc *sc) ether_ifattach(ifp, eaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); if (pmf_device_register(sc->sc_dev, NULL, NULL)) pmf_class_network_register(sc->sc_dev, ifp); diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c index a0949c2d81d..ee23f579027 100644 --- a/sys/dev/ic/rtl81x9.c +++ b/sys/dev/ic/rtl81x9.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtl81x9.c,v 1.94 2012/07/22 14:32:58 matt Exp $ */ +/* $NetBSD: rtl81x9.c,v 1.95 2014/08/10 16:44:35 tls Exp $ */ /* * Copyright (c) 1997, 1998 @@ -86,7 +86,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.94 2012/07/22 14:32:58 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.95 2014/08/10 16:44:35 tls Exp $"); #include <sys/param.h> @@ -740,7 +740,7 @@ rtk_attach(struct rtk_softc *sc) ether_ifattach(ifp, eaddr); rnd_attach_source(&sc->rnd_source, device_xname(self), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); return; fail_4: diff --git a/sys/dev/ic/seeq8005.c b/sys/dev/ic/seeq8005.c index f14a0ba66c9..47d848fc121 100644 --- a/sys/dev/ic/seeq8005.c +++ b/sys/dev/ic/seeq8005.c @@ -1,4 +1,4 @@ -/* $NetBSD: seeq8005.c,v 1.51 2012/10/10 22:40:33 skrll Exp $ */ +/* $NetBSD: seeq8005.c,v 1.52 2014/08/10 16:44:35 tls Exp $ */ /* * Copyright (c) 2000, 2001 Ben Harris @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.51 2012/10/10 22:40:33 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.52 2014/08/10 16:44:35 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -293,7 +293,7 @@ seeq8005_attach(struct seeq8005_softc *sc, const u_int8_t *myaddr, int *media, /* After \n because it can print a line of its own. */ rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); } /* diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c index 1e0419c05b1..a125b519bbf 100644 --- a/sys/dev/ic/smc91cxx.c +++ b/sys/dev/ic/smc91cxx.c @@ -1,4 +1,4 @@ -/* $NetBSD: smc91cxx.c,v 1.87 2014/07/10 15:26:30 christos Exp $ */ +/* $NetBSD: smc91cxx.c,v 1.88 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.87 2014/07/10 15:26:30 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.88 2014/08/10 16:44:35 tls Exp $"); #include "opt_inet.h" @@ -377,7 +377,7 @@ smc91cxx_attach(struct smc91cxx_softc *sc, u_int8_t *myea) } rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); callout_init(&sc->sc_mii_callout, 0); diff --git a/sys/dev/ic/tulip.c b/sys/dev/ic/tulip.c index b381494ecea..d0e3bcf6ee7 100644 --- a/sys/dev/ic/tulip.c +++ b/sys/dev/ic/tulip.c @@ -1,4 +1,4 @@ -/* $NetBSD: tulip.c,v 1.183 2013/09/15 14:58:32 martin Exp $ */ +/* $NetBSD: tulip.c,v 1.184 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.183 2013/09/15 14:58:32 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.184 2014/08/10 16:44:35 tls Exp $"); #include <sys/param.h> @@ -524,7 +524,7 @@ tlp_attach(struct tulip_softc *sc, const uint8_t *enaddr) ether_set_ifflags_cb(&sc->sc_ethercom, tlp_ifflags_cb); rnd_attach_source(&sc->sc_rnd_source, device_xname(self), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); if (pmf_device_register(self, NULL, NULL)) pmf_class_network_register(self, ifp); diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 97428b23881..72451862ba5 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.104 2014/07/25 08:10:37 dholland Exp $ */ +/* $NetBSD: fd.c,v 1.105 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc. @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.104 2014/07/25 08:10:37 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.105 2014/08/10 16:44:35 tls Exp $"); #include "opt_ddb.h" @@ -587,7 +587,7 @@ fdattach(device_t parent, device_t self, void *aux) mountroothook_establish(fd_mountroot_hook, fd->sc_dev); rnd_attach_source(&fd->rnd_source, device_xname(fd->sc_dev), - RND_TYPE_DISK, 0); + RND_TYPE_DISK, RND_FLAG_DEFAULT); fd_set_geometry(fd); diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c index 0be7aea6762..ad9040f0f95 100644 --- a/sys/dev/isa/if_eg.c +++ b/sys/dev/isa/if_eg.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_eg.c,v 1.86 2013/10/18 08:09:37 apb Exp $ */ +/* $NetBSD: if_eg.c,v 1.87 2014/08/10 16:44:35 tls Exp $ */ /* * Copyright (c) 1993 Dean Huxley <dean@fsa.ca> @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.86 2013/10/18 08:09:37 apb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.87 2014/08/10 16:44:35 tls Exp $"); #include "opt_inet.h" @@ -465,7 +465,7 @@ egattach(device_t parent, device_t self, void *aux) IST_EDGE, IPL_NET, egintr, sc); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); } void diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c index 274d610c59b..2052d4cce48 100644 --- a/sys/dev/isa/if_el.c +++ b/sys/dev/isa/if_el.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_el.c,v 1.89 2012/10/27 17:18:24 chs Exp $ */ +/* $NetBSD: if_el.c,v 1.90 2014/08/10 16:44:35 tls Exp $ */ /* * Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.89 2012/10/27 17:18:24 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.90 2014/08/10 16:44:35 tls Exp $"); #include "opt_inet.h" @@ -255,7 +255,7 @@ elattach(device_t parent, device_t self, void *aux) DPRINTF(("Attaching to random...\n")); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); DPRINTF(("elattach() finished.\n")); } diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c index 221a5d4676b..54ab9c7502b 100644 --- a/sys/dev/isa/if_iy.c +++ b/sys/dev/isa/if_iy.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_iy.c,v 1.92 2013/11/08 03:12:17 christos Exp $ */ +/* $NetBSD: if_iy.c,v 1.93 2014/08/10 16:44:35 tls Exp $ */ /* #define IYDEBUG */ /* #define IYMEMDEBUG */ @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.92 2013/11/08 03:12:17 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.93 2014/08/10 16:44:35 tls Exp $"); #include "opt_inet.h" @@ -363,7 +363,7 @@ iyattach(device_t parent, device_t self, void *aux) IST_EDGE, IPL_NET, iyintr, sc); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); temp = bus_space_read_1(iot, ioh, INT_NO_REG); bus_space_write_1(iot, ioh, INT_NO_REG, (temp & 0xf8) | sc->mappedirq); diff --git a/sys/dev/ld.c b/sys/dev/ld.c index ba569701cf6..d79245b43aa 100644 --- a/sys/dev/ld.c +++ b/sys/dev/ld.c @@ -1,4 +1,4 @@ -/* $NetBSD: ld.c,v 1.74 2014/07/25 08:10:35 dholland Exp $ */ +/* $NetBSD: ld.c,v 1.75 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.74 2014/07/25 08:10:35 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.75 2014/08/10 16:44:35 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -164,7 +164,7 @@ ldattach(struct ld_softc *sc) /* Attach the device into the rnd source list. */ rnd_attach_source(&sc->sc_rnd_source, device_xname(sc->sc_dv), - RND_TYPE_DISK, 0); + RND_TYPE_DISK, RND_FLAG_DEFAULT); /* Register with PMF */ if (!pmf_device_register1(sc->sc_dv, ld_suspend, NULL, ld_shutdown)) diff --git a/sys/dev/marvell/if_gfe.c b/sys/dev/marvell/if_gfe.c index 1e2c6964385..2286fc3bdd8 100644 --- a/sys/dev/marvell/if_gfe.c +++ b/sys/dev/marvell/if_gfe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_gfe.c,v 1.41 2012/07/22 14:32:59 matt Exp $ */ +/* $NetBSD: if_gfe.c,v 1.42 2014/08/10 16:44:35 tls Exp $ */ /* * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.41 2012/07/22 14:32:59 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.42 2014/08/10 16:44:35 tls Exp $"); #include "opt_inet.h" @@ -537,7 +537,7 @@ gfe_attach(device_t parent, device_t self, void *aux) ether_ifattach(ifp, enaddr); bpf_attach(ifp, DLT_EN10MB, sizeof(struct ether_header)); rnd_attach_source(&sc->sc_rnd_source, device_xname(self), RND_TYPE_NET, - 0); + RND_FLAG_DEFAULT); marvell_intr_establish(mva->mva_irq, IPL_NET, gfe_intr, sc); } diff --git a/sys/dev/marvell/if_mvgbe.c b/sys/dev/marvell/if_mvgbe.c index be7ce42b8b4..d51f01964e2 100644 --- a/sys/dev/marvell/if_mvgbe.c +++ b/sys/dev/marvell/if_mvgbe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_mvgbe.c,v 1.38 2014/03/15 13:33:48 kiyohara Exp $ */ +/* $NetBSD: if_mvgbe.c,v 1.39 2014/08/10 16:44:35 tls Exp $ */ /* * Copyright (c) 2007, 2008, 2013 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.38 2014/03/15 13:33:48 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.39 2014/08/10 16:44:35 tls Exp $"); #include "opt_multiprocessor.h" @@ -894,7 +894,7 @@ mvgbe_attach(device_t parent, device_t self, void *aux) NULL, device_xname(sc->sc_dev), "wdogsoft"); #endif rnd_attach_source(&sc->sc_rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); return; diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c index 78d4c1ea1e0..842c8217506 100644 --- a/sys/dev/mca/ed_mca.c +++ b/sys/dev/mca/ed_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: ed_mca.c,v 1.57 2014/07/25 08:10:37 dholland Exp $ */ +/* $NetBSD: ed_mca.c,v 1.58 2014/08/10 16:44:35 tls Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.57 2014/07/25 08:10:37 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.58 2014/08/10 16:44:35 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -189,7 +189,7 @@ ed_mca_attach(device_t parent, device_t self, void *aux) disk_init(&ed->sc_dk, device_xname(ed->sc_dev), &eddkdriver); disk_attach(&ed->sc_dk); rnd_attach_source(&ed->rnd_source, device_xname(ed->sc_dev), - RND_TYPE_DISK, 0); + RND_TYPE_DISK, RND_FLAG_DEFAULT); ed->sc_flags |= EDF_INIT; diff --git a/sys/dev/pci/amdpm.c b/sys/dev/pci/amdpm.c index a6d8b4e142e..93008d20300 100644 --- a/sys/dev/pci/amdpm.c +++ b/sys/dev/pci/amdpm.c @@ -1,4 +1,4 @@ -/* $NetBSD: amdpm.c,v 1.37 2013/06/13 00:55:01 tls Exp $ */ +/* $NetBSD: amdpm.c,v 1.38 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.37 2013/06/13 00:55:01 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.38 2014/08/10 16:44:35 tls Exp $"); #include "opt_amdpm.h" @@ -194,18 +194,7 @@ amdpm_attach(device_t parent, device_t self, void *aux) amdpm_rnd_get, sc); rnd_attach_source(&sc->sc_rnd_source, device_xname(self), RND_TYPE_RNG, - /* - * XXX Careful! The use of RND_FLAG_NO_ESTIMATE - * XXX here is unobvious: we later feed raw bits - * XXX into the "entropy pool" with rnd_add_data, - * XXX explicitly supplying an entropy estimate. - * XXX In this context, NO_ESTIMATE serves only - * XXX to prevent rnd_add_data from trying to - * XXX use the *time at which we added the data* - * XXX as entropy, which is not a good idea since - * XXX we add data periodically from a callout. - */ - RND_FLAG_NO_ESTIMATE|RND_FLAG_HASCB); + RND_FLAG_COLLECT_VALUE|RND_FLAG_HASCB); #ifdef AMDPM_RND_COUNTERS evcnt_attach_dynamic(&sc->sc_rnd_hits, EVCNT_TYPE_MISC, NULL, device_xname(self), "rnd hits"); diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index 6b45dc18893..c0ae9ca128c 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $NetBSD: auich.c,v 1.143 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: auich.c,v 1.144 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 2000, 2004, 2005, 2008 The NetBSD Foundation, Inc. @@ -111,7 +111,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.143 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.144 2014/08/10 16:44:35 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -123,6 +123,7 @@ __KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.143 2014/03/29 19:28:24 christos Exp $") #include <sys/sysctl.h> #include <sys/audioio.h> #include <sys/bus.h> +#include <sys/rnd.h> #include <dev/pci/pcidevs.h> #include <dev/pci/pcivar.h> @@ -1701,6 +1702,8 @@ auich_calibrate(struct auich_softc *sc) return; } + rnd_add_data(NULL, &wait_us, sizeof(wait_us), 1); + actual_48k_rate = (bytes * UINT64_C(250000)) / wait_us; if (actual_48k_rate < 50000) diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c index ecc8d273692..b6daff0f20f 100644 --- a/sys/dev/pci/hifn7751.c +++ b/sys/dev/pci/hifn7751.c @@ -1,4 +1,4 @@ -/* $NetBSD: hifn7751.c,v 1.55 2014/06/03 13:53:28 msaitoh Exp $ */ +/* $NetBSD: hifn7751.c,v 1.56 2014/08/10 16:44:35 tls Exp $ */ /* $FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */ /* $OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $ */ @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.55 2014/06/03 13:53:28 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.56 2014/08/10 16:44:35 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -595,20 +595,9 @@ hifn_init_pubrng(struct hifn_softc *sc) #ifdef __NetBSD__ rndsource_setcb(&sc->sc_rnd_source, hifn_rng_get, sc); - /* - * XXX Careful! The use of RND_FLAG_NO_ESTIMATE - * XXX here is unobvious: we later feed raw bits - * XXX into the "entropy pool" with rnd_add_data, - * XXX explicitly supplying an entropy estimate. - * XXX In this context, NO_ESTIMATE serves only - * XXX to prevent rnd_add_data from trying to - * XXX use the *time at which we added the data* - * XXX as entropy, which is not a good idea since - * XXX we add data periodically from a callout. - */ rnd_attach_source(&sc->sc_rnd_source, device_xname(sc->sc_dv), RND_TYPE_RNG, - RND_FLAG_NO_ESTIMATE|RND_FLAG_HASCB); + RND_FLAG_COLLECT_VALUE|RND_FLAG_HASCB); #endif if (hz >= 100) diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c index 2a423f6f405..1316d1ebfc5 100644 --- a/sys/dev/pci/if_bce.c +++ b/sys/dev/pci/if_bce.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bce.c,v 1.38 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: if_bce.c,v 1.39 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 2003 Clifford Wright. All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.38 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.39 2014/08/10 16:44:36 tls Exp $"); #include "vlan.h" @@ -461,7 +461,7 @@ bce_attach(device_t parent, device_t self, void *aux) ether_sprintf(sc->enaddr)); ether_ifattach(ifp, sc->enaddr); rnd_attach_source(&sc->rnd_source, device_xname(self), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); callout_init(&sc->bce_timeout, 0); if (pmf_device_register(self, NULL, bce_resume)) diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index ea432641c80..3d791f32231 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bge.c,v 1.276 2014/08/05 04:29:01 msaitoh Exp $ */ +/* $NetBSD: if_bge.c,v 1.277 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.276 2014/08/05 04:29:01 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.277 2014/08/10 16:44:36 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -3998,7 +3998,7 @@ bge_attach(device_t parent, device_t self, void *aux) ether_ifattach(ifp, eaddr); ether_set_ifflags_cb(&sc->ethercom, bge_ifflags_cb); rnd_attach_source(&sc->rnd_source, device_xname(sc->bge_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); #ifdef BGE_EVENT_COUNTERS /* * Attach event counters. diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c index 66e240c7d57..a99ebaa3916 100644 --- a/sys/dev/pci/if_cas.c +++ b/sys/dev/pci/if_cas.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cas.c,v 1.21 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: if_cas.c,v 1.22 2014/08/10 16:44:36 tls Exp $ */ /* $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $ */ /* @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.21 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.22 2014/08/10 16:44:36 tls Exp $"); #ifndef _MODULE #include "opt_inet.h" @@ -612,7 +612,7 @@ cas_config(struct cas_softc *sc, const uint8_t *enaddr) ether_ifattach(ifp, enaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); evcnt_attach_dynamic(&sc->sc_ev_intr, EVCNT_TYPE_INTR, NULL, device_xname(sc->sc_dev), "interrupts"); diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index b06a338b5e3..5d57a9b78ba 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_de.c,v 1.143 2014/05/18 18:43:46 christos Exp $ */ +/* $NetBSD: if_de.c,v 1.144 2014/08/10 16:44:36 tls Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -37,7 +37,7 @@ * board which support 21040, 21041, or 21140 (mostly). */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.143 2014/05/18 18:43:46 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.144 2014/08/10 16:44:36 tls Exp $"); #define TULIP_HDR_DATA @@ -5143,7 +5143,7 @@ tulip_attach( #if defined(__NetBSD__) rnd_attach_source(&sc->tulip_rndsource, device_xname(sc->tulip_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); #endif } diff --git a/sys/dev/pci/if_dge.c b/sys/dev/pci/if_dge.c index 0cfb804e8be..7c5c382a433 100644 --- a/sys/dev/pci/if_dge.c +++ b/sys/dev/pci/if_dge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_dge.c,v 1.37 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: if_dge.c,v 1.38 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 2004, SUNET, Swedish University Computer Network. @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.37 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.38 2014/08/10 16:44:36 tls Exp $"); @@ -895,7 +895,7 @@ dge_attach(device_t parent, device_t self, void *aux) if_attach(ifp); ether_ifattach(ifp, enaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); #ifdef DGE_EVENT_COUNTERS /* Fix segment event naming */ diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c index b82b1ada3e6..6144ab381e5 100644 --- a/sys/dev/pci/if_jme.c +++ b/sys/dev/pci/if_jme.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_jme.c,v 1.25 2014/03/29 19:28:24 christos Exp $ */ +/* $NetBSD: if_jme.c,v 1.26 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 2008 Manuel Bouyer. All rights reserved. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.25 2014/03/29 19:28:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.26 2014/08/10 16:44:36 tls Exp $"); #include <sys/param.h> @@ -510,7 +510,7 @@ jme_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't establish power handler\n"); rnd_attach_source(&sc->rnd_source, device_xname(self), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); sc->jme_intrxto = PCCRX_COAL_TO_DEFAULT; sc->jme_intrxct = PCCRX_COAL_PKT_DEFAULT; diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 57357ba5782..ba27411b3be 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_msk.c,v 1.45 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: if_msk.c,v 1.46 2014/08/10 16:44:36 tls Exp $ */ /* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */ /* @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.45 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.46 2014/08/10 16:44:36 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1117,7 +1117,7 @@ msk_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't establish power handler\n"); rnd_attach_source(&sc->rnd_source, device_xname(sc->sk_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); DPRINTFN(2, ("msk_attach: end\n")); return; diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c index ed527cd71bf..2fccbb9dd05 100644 --- a/sys/dev/pci/if_pcn.c +++ b/sys/dev/pci/if_pcn.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_pcn.c,v 1.57 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: if_pcn.c,v 1.58 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.57 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.58 2014/08/10 16:44:36 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -814,7 +814,7 @@ pcn_attach(device_t parent, device_t self, void *aux) if_attach(ifp); ether_ifattach(ifp, enaddr); rnd_attach_source(&sc->rnd_source, device_xname(self), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); #ifdef PCN_EVENT_COUNTERS /* Attach event counters. */ diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c index bf77b2d2ac5..568ade45d95 100644 --- a/sys/dev/pci/if_sip.c +++ b/sys/dev/pci/if_sip.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sip.c,v 1.157 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: if_sip.c,v 1.158 2014/08/10 16:44:36 tls Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.157 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.158 2014/08/10 16:44:36 tls Exp $"); @@ -1290,7 +1290,7 @@ sipcom_attach(device_t parent, device_t self, void *aux) sc->sc_prev.is_vlan = VLAN_ATTACHED(&(sc)->sc_ethercom); sc->sc_prev.if_capenable = ifp->if_capenable; rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); /* * The number of bytes that must be available in diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index d3d6c2e53c6..0f0076551be 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sk.c,v 1.77 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: if_sk.c,v 1.78 2014/08/10 16:44:36 tls Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -115,7 +115,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.77 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.78 2014/08/10 16:44:36 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1462,7 +1462,7 @@ sk_attach(device_t parent, device_t self, void *aux) ether_ifattach(ifp, sc_if->sk_enaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->sk_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); if (pmf_device_register(self, NULL, sk_resume)) pmf_class_network_register(self, ifp); diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index 8400779bcc9..c9d688d59ea 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tl.c,v 1.100 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: if_tl.c,v 1.101 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.100 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.101 2014/08/10 16:44:36 tls Exp $"); #undef TLDEBUG #define TL_PRIV_STATS @@ -470,7 +470,7 @@ tl_pci_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't establish power handler\n"); rnd_attach_source(&sc->rnd_source, device_xname(self), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); } static void diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index 8696fc5f043..758e2d649b7 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_vr.c,v 1.113 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: if_vr.c,v 1.114 2014/08/10 16:44:36 tls Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.113 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.114 2014/08/10 16:44:36 tls Exp $"); @@ -1742,7 +1742,7 @@ vr_attach(device_t parent, device_t self, void *aux) ether_ifattach(ifp, sc->vr_enaddr); rnd_attach_source(&sc->rnd_source, device_xname(self), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); if (pmf_device_register1(self, NULL, vr_resume, vr_shutdown)) pmf_class_network_register(self, ifp); diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c index 03be63f1c2a..154c99b0953 100644 --- a/sys/dev/pci/if_vte.c +++ b/sys/dev/pci/if_vte.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_vte.c,v 1.10 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: if_vte.c,v 1.11 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 2011 Manuel Bouyer. All rights reserved. @@ -55,7 +55,7 @@ /* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.10 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.11 2014/08/10 16:44:36 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -276,7 +276,7 @@ vte_attach(device_t parent, device_t self, void *aux) aprint_error_dev(self, "couldn't establish power handler\n"); rnd_attach_source(&sc->rnd_source, device_xname(self), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); if (sysctl_createv(&sc->vte_clog, 0, NULL, &node, 0, CTLTYPE_NODE, device_xname(sc->vte_dev), diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c index ae8e34488fc..12bf45d0e6b 100644 --- a/sys/dev/pci/if_wm.c +++ b/sys/dev/pci/if_wm.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.288 2014/08/07 06:49:06 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.289 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.288 2014/08/07 06:49:06 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289 2014/08/10 16:44:36 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2185,7 +2185,8 @@ wm_attach(device_t parent, device_t self, void *aux) if_attach(ifp); ether_ifattach(ifp, enaddr); ether_set_ifflags_cb(&sc->sc_ethercom, wm_ifflags_cb); - rnd_attach_source(&sc->rnd_source, xname, RND_TYPE_NET, 0); + rnd_attach_source(&sc->rnd_source, xname, RND_TYPE_NET, + RND_FLAG_DEFAULT); #ifdef WM_EVENT_COUNTERS /* Attach event counters. */ diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c index b5198cffc7f..431a44bdc5d 100644 --- a/sys/dev/pci/ubsec.c +++ b/sys/dev/pci/ubsec.c @@ -1,4 +1,4 @@ -/* $NetBSD: ubsec.c,v 1.40 2014/04/19 12:29:24 bad Exp $ */ +/* $NetBSD: ubsec.c,v 1.41 2014/08/10 16:44:36 tls Exp $ */ /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */ /* $OpenBSD: ubsec.c,v 1.143 2009/03/27 13:31:30 reyk Exp$ */ @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.40 2014/04/19 12:29:24 bad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.41 2014/08/10 16:44:36 tls Exp $"); #undef UBSEC_DEBUG @@ -510,7 +510,7 @@ ubsec_attach(device_t parent, device_t self, void *aux) rndsource_setcb(&sc->sc_rnd_source, ubsec_rng_get, sc); rnd_attach_source(&sc->sc_rnd_source, device_xname(sc->sc_dev), RND_TYPE_RNG, - RND_FLAG_NO_ESTIMATE|RND_FLAG_HASCB); + RND_FLAG_COLLECT_VALUE|RND_FLAG_HASCB); if (hz >= 100) sc->sc_rnghz = hz / 100; else diff --git a/sys/dev/pci/viaenv.c b/sys/dev/pci/viaenv.c index b8be47e2006..1bd968e1232 100644 --- a/sys/dev/pci/viaenv.c +++ b/sys/dev/pci/viaenv.c @@ -1,4 +1,4 @@ -/* $NetBSD: viaenv.c,v 1.31 2011/06/20 17:29:06 pgoyette Exp $ */ +/* $NetBSD: viaenv.c,v 1.32 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 2000 Johan Danielsson @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: viaenv.c,v 1.31 2011/06/20 17:29:06 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: viaenv.c,v 1.32 2014/08/10 16:44:36 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -345,6 +345,7 @@ viaenv_attach(device_t parent, device_t self, void *aux) for (i = 0; i < 10; i++) sc->sc_sensor[i].state = ENVSYS_SINVALID; + sc->sc_sensor[i].flags |= ENVSYS_FHAS_ENTROPY; sc->sc_sme = sysmon_envsys_create(); diff --git a/sys/dev/pcmcia/if_xi.c b/sys/dev/pcmcia/if_xi.c index 593dc8e8ee2..080c4348d90 100644 --- a/sys/dev/pcmcia/if_xi.c +++ b/sys/dev/pcmcia/if_xi.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_xi.c,v 1.73 2012/07/22 14:33:05 matt Exp $ */ +/* $NetBSD: if_xi.c,v 1.74 2014/08/10 16:44:36 tls Exp $ */ /* OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp */ /* @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.73 2012/07/22 14:33:05 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.74 2014/08/10 16:44:36 tls Exp $"); #include "opt_inet.h" #include "opt_ipx.h" @@ -249,7 +249,7 @@ xi_attach(struct xi_softc *sc, u_int8_t *myea) ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER | IFM_AUTO); rnd_attach_source(&sc->sc_rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); } int diff --git a/sys/dev/rndpseudo.c b/sys/dev/rndpseudo.c index 6644e0811c0..07161e8fd80 100644 --- a/sys/dev/rndpseudo.c +++ b/sys/dev/rndpseudo.c @@ -1,4 +1,4 @@ -/* $NetBSD: rndpseudo.c,v 1.20 2014/07/25 08:10:35 dholland Exp $ */ +/* $NetBSD: rndpseudo.c,v 1.21 2014/08/10 16:44:35 tls Exp $ */ /*- * Copyright (c) 1997-2013 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.20 2014/07/25 08:10:35 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.21 2014/08/10 16:44:35 tls Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -515,12 +515,25 @@ krndsource_to_rndsource(krndsource_t *kr, rndsource_t *r) r->flags = kr->flags; } +static void +krndsource_to_rndsource_est(krndsource_t *kr, rndsource_est_t *re) +{ + memset(re, 0, sizeof(*re)); + krndsource_to_rndsource(kr, &re->rt); + re->dt_samples = kr->time_delta.insamples; + re->dt_total = kr->time_delta.outbits; + re->dv_samples = kr->value_delta.insamples; + re->dv_total = kr->value_delta.outbits; +} + int rnd_ioctl(struct file *fp, u_long cmd, void *addr) { krndsource_t *kr; rndstat_t *rst; rndstat_name_t *rstnm; + rndstat_est_t *rset; + rndstat_est_name_t *rsetnm; rndctl_t *rctl; rnddata_t *rnddata; u_int32_t count, start; @@ -536,6 +549,8 @@ rnd_ioctl(struct file *fp, u_long cmd, void *addr) case RNDGETPOOLSTAT: case RNDGETSRCNUM: case RNDGETSRCNAME: + case RNDGETESTNUM: + case RNDGETESTNAME: ret = kauth_authorize_device(curlwp->l_cred, KAUTH_DEVICE_RND_GETPRIV, NULL, NULL, NULL, NULL); if (ret) @@ -624,6 +639,41 @@ rnd_ioctl(struct file *fp, u_long cmd, void *addr) mutex_spin_exit(&rndpool_mtx); break; + case RNDGETESTNUM: + rset = (rndstat_est_t *)addr; + + if (rset->count == 0) + break; + + if (rset->count > RND_MAXSTATCOUNT) + return (EINVAL); + + mutex_spin_enter(&rndpool_mtx); + /* + * Find the starting source by running through the + * list of sources. + */ + kr = rnd_sources.lh_first; + start = rset->start; + while (kr != NULL && start > 1) { + kr = kr->list.le_next; + start--; + } + + /* Return up to as many structures as the user asked + * for. If we run out of sources, a count of zero + * will be returned, without an error. + */ + for (count = 0; count < rset->count && kr != NULL; count++) { + krndsource_to_rndsource_est(kr, &rset->source[count]); + kr = kr->list.le_next; + } + + rset->count = count; + + mutex_spin_exit(&rndpool_mtx); + break; + case RNDGETSRCNAME: /* * Scan through the list, trying to find the name. @@ -634,7 +684,7 @@ rnd_ioctl(struct file *fp, u_long cmd, void *addr) while (kr != NULL) { if (strncmp(kr->name, rstnm->name, MIN(sizeof(kr->name), - sizeof(*rstnm))) == 0) { + sizeof(rstnm->name))) == 0) { krndsource_to_rndsource(kr, &rstnm->source); mutex_spin_exit(&rndpool_mtx); return (0); @@ -647,6 +697,30 @@ rnd_ioctl(struct file *fp, u_long cmd, void *addr) break; + case RNDGETESTNAME: + /* + * Scan through the list, trying to find the name. + */ + mutex_spin_enter(&rndpool_mtx); + rsetnm = (rndstat_est_name_t *)addr; + kr = rnd_sources.lh_first; + while (kr != NULL) { + if (strncmp(kr->name, rsetnm->name, + MIN(sizeof(kr->name), + sizeof(rsetnm->name))) == 0) { + krndsource_to_rndsource_est(kr, + &rsetnm->source); + mutex_spin_exit(&rndpool_mtx); + return (0); + } + kr = kr->list.le_next; + } + mutex_spin_exit(&rndpool_mtx); + + ret = ENOENT; /* name not found */ + + break; + case RNDCTL: /* * Set flags to enable/disable entropy counting and/or @@ -663,9 +737,11 @@ rnd_ioctl(struct file *fp, u_long cmd, void *addr) while (kr != NULL) { if (kr->type == rctl->type) { kr->flags &= ~rctl->mask; + kr->flags |= (rctl->flags & rctl->mask); } + kr = kr->list.le_next; } mutex_spin_exit(&rndpool_mtx); @@ -681,7 +757,7 @@ rnd_ioctl(struct file *fp, u_long cmd, void *addr) sizeof(rctl->name))) == 0) { kr->flags &= ~rctl->mask; kr->flags |= (rctl->flags & rctl->mask); - + mutex_spin_exit(&rndpool_mtx); return (0); } diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c index 89da03ff8d4..e8acc797710 100644 --- a/sys/dev/scsipi/cd.c +++ b/sys/dev/scsipi/cd.c @@ -1,4 +1,4 @@ -/* $NetBSD: cd.c,v 1.322 2014/07/25 08:10:38 dholland Exp $ */ +/* $NetBSD: cd.c,v 1.323 2014/08/10 16:44:36 tls Exp $ */ /*- * Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation, @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.322 2014/07/25 08:10:38 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.323 2014/08/10 16:44:36 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -303,7 +303,7 @@ cdattach(device_t parent, device_t self, void *aux) aprint_naive("\n"); rnd_attach_source(&cd->rnd_source, device_xname(cd->sc_dev), - RND_TYPE_DISK, 0); + RND_TYPE_DISK, RND_FLAG_DEFAULT); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "couldn't establish power handler\n"); diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c index bf61fe2e833..48f8352fee5 100644 --- a/sys/dev/scsipi/sd.c +++ b/sys/dev/scsipi/sd.c @@ -1,4 +1,4 @@ -/* $NetBSD: sd.c,v 1.307 2014/07/25 08:10:38 dholland Exp $ */ +/* $NetBSD: sd.c,v 1.308 2014/08/10 16:44:36 tls Exp $ */ /*- * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.307 2014/07/25 08:10:38 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.308 2014/08/10 16:44:36 tls Exp $"); #include "opt_scsi.h" @@ -334,7 +334,7 @@ sdattach(device_t parent, device_t self, void *aux) * attach the device into the random source list */ rnd_attach_source(&sd->rnd_source, device_xname(sd->sc_dev), - RND_TYPE_DISK, 0); + RND_TYPE_DISK, RND_FLAG_DEFAULT); /* Discover wedges on this disk. */ dkwedge_discover(&sd->sc_dk); diff --git a/sys/dev/scsipi/st.c b/sys/dev/scsipi/st.c index 60362c82166..b777e360b1d 100644 --- a/sys/dev/scsipi/st.c +++ b/sys/dev/scsipi/st.c @@ -1,4 +1,4 @@ -/* $NetBSD: st.c,v 1.225 2014/07/25 08:10:39 dholland Exp $ */ +/* $NetBSD: st.c,v 1.226 2014/08/10 16:44:36 tls Exp $ */ /*- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.225 2014/07/25 08:10:39 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.226 2014/08/10 16:44:36 tls Exp $"); #include "opt_scsi.h" @@ -422,7 +422,7 @@ stattach(device_t parent, device_t self, void *aux) device_xname(st->sc_dev)); rnd_attach_source(&st->rnd_source, device_xname(st->sc_dev), - RND_TYPE_TAPE, 0); + RND_TYPE_TAPE, RND_FLAG_DEFAULT); } int diff --git a/sys/dev/sysmon/sysmon_envsys.c b/sys/dev/sysmon/sysmon_envsys.c index 16e8604aced..57967eaae84 100644 --- a/sys/dev/sysmon/sysmon_envsys.c +++ b/sys/dev/sysmon/sysmon_envsys.c @@ -1,4 +1,4 @@ -/* $NetBSD: sysmon_envsys.c,v 1.126 2012/11/29 10:29:45 msaitoh Exp $ */ +/* $NetBSD: sysmon_envsys.c,v 1.127 2014/08/10 16:44:36 tls Exp $ */ /*- * Copyright (c) 2007, 2008 Juan Romero Pardines. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.126 2012/11/29 10:29:45 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.127 2014/08/10 16:44:36 tls Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -778,6 +778,7 @@ out: */ TAILQ_FOREACH(edata, &sme->sme_sensors_list, sensors_head) { if (edata->flags & ENVSYS_FHAS_ENTROPY) { + uint32_t rnd_type, rnd_flag = 0; size_t n; int tail = 1; @@ -797,8 +798,34 @@ out: } else tail = 0; } + rnd_flag |= RND_FLAG_COLLECT_TIME; + rnd_flag |= RND_FLAG_ESTIMATE_TIME; + + switch (edata->units) { + case ENVSYS_STEMP: + case ENVSYS_SFANRPM: + case ENVSYS_INTEGER: + rnd_type = RND_TYPE_ENV; + rnd_flag |= RND_FLAG_COLLECT_VALUE; + rnd_flag |= RND_FLAG_ESTIMATE_VALUE; + break; + case ENVSYS_SVOLTS_AC: + case ENVSYS_SVOLTS_DC: + case ENVSYS_SOHMS: + case ENVSYS_SWATTS: + case ENVSYS_SAMPS: + case ENVSYS_SWATTHOUR: + case ENVSYS_SAMPHOUR: + rnd_type = RND_TYPE_POWER; + rnd_flag |= RND_FLAG_COLLECT_VALUE; + rnd_flag |= RND_FLAG_ESTIMATE_VALUE; + break; + default: + rnd_type = RND_TYPE_UNKNOWN; + break; + } rnd_attach_source(&edata->rnd_src, rnd_name, - RND_TYPE_ENV, 0); + rnd_type, rnd_flag); } } DPRINTF(("%s: driver '%s' registered (nsens=%d nevent=%d)\n", @@ -1206,7 +1233,10 @@ sme_remove_userprops(void) snprintf(rnd_name, sizeof(rnd_name), "%s-%s", sme->sme_name, edata->desc); rnd_attach_source(&edata->rnd_src, rnd_name, - RND_TYPE_ENV, 0); + RND_TYPE_ENV, RND_FLAG_COLLECT_VALUE| + RND_FLAG_COLLECT_TIME| + RND_FLAG_ESTIMATE_VALUE| + RND_FLAG_ESTIMATE_TIME); } } diff --git a/sys/dev/sysmon/sysmon_power.c b/sys/dev/sysmon/sysmon_power.c index ff55ad5e698..6999969a6df 100644 --- a/sys/dev/sysmon/sysmon_power.c +++ b/sys/dev/sysmon/sysmon_power.c @@ -1,4 +1,4 @@ -/* $NetBSD: sysmon_power.c,v 1.46 2012/02/02 19:43:07 tls Exp $ */ +/* $NetBSD: sysmon_power.c,v 1.47 2014/08/10 16:44:36 tls Exp $ */ /*- * Copyright (c) 2007 Juan Romero Pardines. @@ -69,7 +69,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.46 2012/02/02 19:43:07 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.47 2014/08/10 16:44:36 tls Exp $"); #include "opt_compat_netbsd.h" #include <sys/param.h> @@ -201,7 +201,7 @@ sysmon_power_init(void) selinit(&sysmon_power_event_queue_selinfo); rnd_attach_source(&sysmon_rndsource, "system-power", - RND_TYPE_POWER, 0); + RND_TYPE_POWER, RND_FLAG_DEFAULT); } diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index eb9c12e5d27..6ae2a1d36ad 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_aue.c,v 1.131 2013/04/27 15:57:41 tsutsui Exp $ */ +/* $NetBSD: if_aue.c,v 1.132 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -78,7 +78,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.131 2013/04/27 15:57:41 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132 2014/08/10 16:44:36 tls Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -859,7 +859,7 @@ aue_attach(device_t parent, device_t self, void *aux) if_attach(ifp); ether_ifattach(ifp, eaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->aue_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); callout_init(&(sc->aue_stat_ch), 0); diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index 6f6c55df8a4..df4995faaec 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_axe.c,v 1.66 2013/11/08 17:46:35 roy Exp $ */ +/* $NetBSD: if_axe.c,v 1.67 2014/08/10 16:44:36 tls Exp $ */ /* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */ /* @@ -89,7 +89,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.66 2013/11/08 17:46:35 roy Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.67 2014/08/10 16:44:36 tls Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -843,7 +843,7 @@ axe_attach(device_t parent, device_t self, void *aux) if_attach(ifp); ether_ifattach(ifp, eaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->axe_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); callout_init(&sc->axe_stat_ch, 0); callout_setfunc(&sc->axe_stat_ch, axe_tick, sc); diff --git a/sys/dev/usb/if_axen.c b/sys/dev/usb/if_axen.c index 18100f23b18..b04e8ee7849 100644 --- a/sys/dev/usb/if_axen.c +++ b/sys/dev/usb/if_axen.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_axen.c,v 1.2 2013/10/29 16:10:49 joerg Exp $ */ +/* $NetBSD: if_axen.c,v 1.3 2014/08/10 16:44:36 tls Exp $ */ /* $OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $ */ /* @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.2 2013/10/29 16:10:49 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.3 2014/08/10 16:44:36 tls Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -786,7 +786,7 @@ axen_attach(device_t parent, device_t self, void *aux) if_attach(ifp); ether_ifattach(ifp, eaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->axen_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); callout_init(&sc->axen_stat_ch, 0); callout_setfunc(&sc->axen_stat_ch, axen_tick, sc); diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index e2c1fe0dc41..f5f6777e2b5 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cue.c,v 1.67 2013/01/22 14:03:19 jmcneill Exp $ */ +/* $NetBSD: if_cue.c,v 1.68 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.67 2013/01/22 14:03:19 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.68 2014/08/10 16:44:36 tls Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -551,7 +551,7 @@ cue_attach(device_t parent, device_t self, void *aux) if_attach(ifp); ether_ifattach(ifp, eaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->cue_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); callout_init(&(sc->cue_stat_ch), 0); diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index 46c22cc1307..389d94b76b5 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_kue.c,v 1.80 2013/10/16 07:34:20 skrll Exp $ */ +/* $NetBSD: if_kue.c,v 1.81 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.80 2013/10/16 07:34:20 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.81 2014/08/10 16:44:36 tls Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -507,7 +507,7 @@ kue_attach(device_t parent, device_t self, void *aux) if_attach(ifp); ether_ifattach(ifp, sc->kue_desc.kue_macaddr); rnd_attach_source(&sc->rnd_source, device_xname(sc->kue_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); sc->kue_attached = true; splx(s); diff --git a/sys/dev/usb/if_smsc.c b/sys/dev/usb/if_smsc.c index 9e689237049..83971f5a025 100644 --- a/sys/dev/usb/if_smsc.c +++ b/sys/dev/usb/if_smsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_smsc.c,v 1.18 2014/07/23 06:10:40 skrll Exp $ */ +/* $NetBSD: if_smsc.c,v 1.19 2014/08/10 16:44:36 tls Exp $ */ /* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */ /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */ @@ -1116,7 +1116,7 @@ smsc_attach(device_t parent, device_t self, void *aux) ether_ifattach(ifp, sc->sc_enaddr); rnd_attach_source(&sc->sc_rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); callout_init(&sc->sc_stat_ch, 0); diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c index 29feaaa7b92..48607e5a562 100644 --- a/sys/dev/usb/if_udav.c +++ b/sys/dev/usb/if_udav.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_udav.c,v 1.42 2013/12/20 01:17:54 jakllsch Exp $ */ +/* $NetBSD: if_udav.c,v 1.43 2014/08/10 16:44:36 tls Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ /* @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.42 2013/12/20 01:17:54 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.43 2014/08/10 16:44:36 tls Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -319,7 +319,7 @@ skipmii: ether_ifattach(ifp, eaddr); rnd_attach_source(&sc->rnd_source, device_xname(self), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); callout_init(&sc->sc_stat_ch, 0); sc->sc_attached = 1; diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c index 5522c0f5d28..2b154b41cd0 100644 --- a/sys/dev/usb/if_upl.c +++ b/sys/dev/usb/if_upl.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_upl.c,v 1.46 2014/06/05 23:48:16 rmind Exp $ */ +/* $NetBSD: if_upl.c,v 1.47 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.46 2014/06/05 23:48:16 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.47 2014/08/10 16:44:36 tls Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -311,7 +311,7 @@ upl_attach(device_t parent, device_t self, void *aux) bpf_attach(ifp, DLT_RAW, 0); rnd_attach_source(&sc->sc_rnd_source, device_xname(sc->sc_dev), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); sc->sc_attached = 1; splx(s); diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index ddb8320c4d1..f0e05b937b5 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_url.c,v 1.47 2013/01/22 12:40:43 jmcneill Exp $ */ +/* $NetBSD: if_url.c,v 1.48 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 2001, 2002 @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.47 2013/01/22 12:40:43 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.48 2014/08/10 16:44:36 tls Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -315,7 +315,7 @@ url_attach(device_t parent, device_t self, void *aux) ether_ifattach(ifp, eaddr); rnd_attach_source(&sc->rnd_source, device_xname(self), - RND_TYPE_NET, 0); + RND_TYPE_NET, RND_FLAG_DEFAULT); callout_init(&sc->sc_stat_ch, 0); sc->sc_attached = 1; diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index 805e882fa21..313f27e446b 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -1,4 +1,4 @@ -/* $NetBSD: ucom.c,v 1.106 2014/07/25 16:13:21 gdt Exp $ */ +/* $NetBSD: ucom.c,v 1.107 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.106 2014/07/25 16:13:21 gdt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.107 2014/08/10 16:44:36 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -253,7 +253,7 @@ ucom_attach(device_t parent, device_t self, void *aux) tty_attach(tp); rnd_attach_source(&sc->sc_rndsource, device_xname(sc->sc_dev), - RND_TYPE_TTY, 0); + RND_TYPE_TTY, RND_FLAG_DEFAULT); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "couldn't establish power handler\n"); diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c index 49addd5a1a5..2547c6ab535 100644 --- a/sys/dev/usb/uhidev.c +++ b/sys/dev/usb/uhidev.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhidev.c,v 1.60 2014/06/17 09:35:46 skrll Exp $ */ +/* $NetBSD: uhidev.c,v 1.61 2014/08/10 16:44:36 tls Exp $ */ /* * Copyright (c) 2001, 2012 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.60 2014/06/17 09:35:46 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.61 2014/08/10 16:44:36 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -358,7 +358,8 @@ nomem: #endif rnd_attach_source(&csc->rnd_source, device_xname(dev), - RND_TYPE_TTY, 0); + RND_TYPE_TTY, + RND_FLAG_DEFAULT); } } } |
