Module Name: src
Committed By: riastradh
Date: Sun Aug 14 20:33:57 UTC 2022
Modified Files:
src/sys/dev/mii: mii_physubr.c
Log Message:
mii(4): Sprinkle assertions in mii phy auto timeout.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/mii/mii_physubr.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/mii/mii_physubr.c
diff -u src/sys/dev/mii/mii_physubr.c:1.97 src/sys/dev/mii/mii_physubr.c:1.98
--- src/sys/dev/mii/mii_physubr.c:1.97 Tue Dec 28 12:00:48 2021
+++ src/sys/dev/mii/mii_physubr.c Sun Aug 14 20:33:57 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.97 2021/12/28 12:00:48 riastradh Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.98 2022/08/14 20:33:57 riastradh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.97 2021/12/28 12:00:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.98 2022/08/14 20:33:57 riastradh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -308,6 +308,8 @@ static void
mii_phy_auto_timeout_locked(struct mii_softc *sc)
{
+ KASSERT(mii_locked(sc->mii_pdata));
+
if (!device_is_active(sc->mii_dev))
return;
@@ -322,6 +324,8 @@ mii_phy_auto_timeout(void *arg)
{
struct mii_softc *sc = arg;
+ KASSERT((sc->mii_flags & MIIF_AUTOTSLEEP) == 0);
+
if (!device_is_active(sc->mii_dev))
return;
