From 788aeb2b3288b15a241449c2816345d6207833de Mon Sep 17 00:00:00 2001 From: Nick Hudson Date: Fri, 29 Jul 2022 16:07:46 +0100 Subject: [PATCH 03/67] wm: comments and KASSERTs --- sys/dev/pci/if_wm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c index 588164d0567f..ce60e7b59c74 100644 --- a/sys/dev/pci/if_wm.c +++ b/sys/dev/pci/if_wm.c @@ -6470,6 +6470,8 @@ wm_init(struct ifnet *ifp) struct wm_softc *sc = ifp->if_softc; int ret; + KASSERT(IFNET_LOCKED(ifp)); + WM_CORE_LOCK(sc); ret = wm_init_locked(ifp); WM_CORE_UNLOCK(sc); @@ -6487,6 +6489,7 @@ wm_init_locked(struct ifnet *ifp) DPRINTF(sc, WM_DEBUG_INIT, ("%s: %s called\n", device_xname(sc->sc_dev), __func__)); + KASSERT(IFNET_LOCKED(ifp)); KASSERT(WM_CORE_LOCKED(sc)); /* @@ -7042,7 +7045,9 @@ wm_init_locked(struct ifnet *ifp) /* Start the one second link check clock. */ callout_schedule(&sc->sc_tick_ch, hz); - /* ...all done! */ + /* + * ...all done! (IFNET_LOCKED asserted above.) + */ ifp->if_flags |= IFF_RUNNING; out: -- 2.25.1