[src-draft/trunk]: src/sys/dev/usb Minor callout optimization, sprinkle a few...

[Martin Husemann <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/f324cacf3708
branches:  trunk
changeset: 377855:f324cacf3708
user:      Martin Husemann <martin%NetBSD.org@localhost>
date:      Thu Dec 10 15:49:43 2020 +0100

description:
Minor callout optimization, sprinkle a few KASSERT.

diffstat:

 sys/dev/usb/if_urtwn.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r 30d617fa033e -r f324cacf3708 sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Thu Dec 10 15:44:21 2020 +0100
+++ b/sys/dev/usb/if_urtwn.c    Thu Dec 10 15:49:43 2020 +0100
@@ -441,6 +441,8 @@ urtwn_attach(device_t parent, device_t s
        /* NNN make these callouts use a vap ... in vap create??? */
        callout_init(&sc->sc_calib_to, 0);
        callout_setfunc(&sc->sc_calib_to, urtwn_calib_to, sc);
+       callout_init(&sc->sc_watchdog_to, 0);
+       callout_setfunc(&sc->sc_watchdog_to, urtwn_watchdog, sc);
 
        error = usbd_set_config_no(sc->sc_udev, 1, 0);
        if (error != 0) {
@@ -3297,6 +3299,7 @@ urtwn_start(struct urtwn_softc *sc)
                        }
                        IF_DEQUEUE(&ic->ic_mgtq, m);
                        ni = M_GETCTX(m, struct ieee80211_node *);
+                       KASSERT(ni != NULL);
                        M_CLEARCTX(m);
                        goto sendit;
                }
@@ -3307,6 +3310,7 @@ urtwn_start(struct urtwn_softc *sc)
                        break;
 
                ni = M_GETCTX(m, struct ieee80211_node *);
+               KASSERT(ni != NULL);
                M_CLEARCTX(m);
                vap = ni->ni_vap;
 
@@ -3380,7 +3384,7 @@ urtwn_start(struct urtwn_softc *sc)
                m_freem(m);
                ieee80211_free_node(ni);
                sc->tx_timer = 5;
-               callout_reset(&sc->sc_watchdog_to, hz, urtwn_watchdog, sc);
+               callout_schedule(&sc->sc_watchdog_to, hz);
        }
 }