Module Name: src
Committed By: skrll
Date: Sat Jul 19 08:38:28 UTC 2014
Modified Files:
src/sys/dev/usb: if_urndis.c
Log Message:
Don't return an error in urndis_init if IFF_RUNNING is set on entry.
That is, fix my mistake in handling PR/48964
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/if_urndis.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/dev/usb/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.8 src/sys/dev/usb/if_urndis.c:1.9
--- src/sys/dev/usb/if_urndis.c:1.8 Sat Jul 5 11:13:13 2014
+++ src/sys/dev/usb/if_urndis.c Sat Jul 19 08:38:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urndis.c,v 1.8 2014/07/05 11:13:13 skrll Exp $ */
+/* $NetBSD: if_urndis.c,v 1.9 2014/07/19 08:38:28 skrll Exp $ */
/* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
/*
@@ -21,7 +21,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.8 2014/07/05 11:13:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.9 2014/07/19 08:38:28 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1033,7 +1033,7 @@ urndis_init(struct ifnet *ifp)
sc = ifp->if_softc;
if (ifp->if_flags & IFF_RUNNING)
- return EBUSY;
+ return 0;
err = urndis_ctrl_init(sc);
if (err != RNDIS_STATUS_SUCCESS)
