Module Name: src
Committed By: maya
Date: Sat Dec 14 15:40:43 UTC 2019
Modified Files:
src/sys/dev/usb: usbnet.c
Log Message:
Don't assume mii is not null here. Some drivers like urndis don't use
mii, so they always have mii == NULL.
ok riastradh. fixes PR kern/54762
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/usb/usbnet.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/usbnet.c
diff -u src/sys/dev/usb/usbnet.c:1.32 src/sys/dev/usb/usbnet.c:1.33
--- src/sys/dev/usb/usbnet.c:1.32 Tue Dec 3 05:01:58 2019
+++ src/sys/dev/usb/usbnet.c Sat Dec 14 15:40:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.c,v 1.32 2019/12/03 05:01:58 riastradh Exp $ */
+/* $NetBSD: usbnet.c,v 1.33 2019/12/14 15:40:43 maya Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.32 2019/12/03 05:01:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.33 2019/12/14 15:40:43 maya Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1188,7 +1188,6 @@ usbnet_tick_task(void *arg)
struct mii_data * const mii = usbnet_mii(un);
KASSERT(ifp != NULL); /* embedded member */
- KASSERT(mii != NULL); /* only removed after dying=true and wait */
unp->unp_refcnt++;
mutex_exit(&unp->unp_lock);
@@ -1197,9 +1196,11 @@ usbnet_tick_task(void *arg)
usbnet_watchdog(ifp);
DPRINTFN(8, "mii %jx ifp %jx", (uintptr_t)mii, (uintptr_t)ifp, 0, 0);
- mii_tick(mii);
- if (!unp->unp_link)
- (*mii->mii_statchg)(ifp);
+ if (mii) {
+ mii_tick(mii);
+ if (!unp->unp_link)
+ (*mii->mii_statchg)(ifp);
+ }
/* Call driver if requested. */
uno_tick(un);
