Module Name: src
Committed By: bouyer
Date: Wed May 13 19:41:07 UTC 2009
Modified Files:
src/sys/arch/xen/xen [netbsd-4]: if_xennet_xenbus.c
Log Message:
Pull up following revision(s) (requested by jym in ticket #1316):
sys/arch/xen/xen/if_xennet_xenbus.c: revision 1.35
Do not forget to detach rnd(4) device when removing a xennet device.
Ok by bouyer@ in private mail.
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 src/sys/arch/xen/xen/if_xennet_xenbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.14.2.1 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.14.2.2
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.14.2.1 Fri Mar 20 14:28:40 2009
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Wed May 13 19:41:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.14.2.1 2009/03/20 14:28:40 msaitoh Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.14.2.2 2009/05/13 19:41:07 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.14.2.1 2009/03/20 14:28:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.14.2.2 2009/05/13 19:41:07 bouyer Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
@@ -377,6 +377,12 @@
ether_ifdetach(ifp);
if_detach(ifp);
+
+#if NRND > 0
+ /* Unhook the entropy source. */
+ rnd_detach_source(&sc->sc_rnd_source);
+#endif
+
while (xengnt_status(sc->sc_tx_ring_gntref)) {
tsleep(xennet_xenbus_detach, PRIBIO, "xnet_txref", hz/2);
}
