Callout drain does not have to be followed by a callout stop call.

Fix bogus code.

MFC after:	1 week
Sponsored by:	Mellanox Technologies

diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 1ba03b4ee940f3be6a36079cff9ae1cb48113062..9d999701e91ea2835c9eeb80c75d225fa33e4c9f 100644 (file)
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1060,15 +1060,13 @@ sppp_detach(struct ifnet *ifp)
        KASSERT(mtx_initialized(&sp->mtx), ("sppp mutex is not initialized"));
 
        /* Stop keepalive handler. */
-       if (!callout_drain(&sp->keepalive_callout))
-               callout_stop(&sp->keepalive_callout);
+       callout_drain(&sp->keepalive_callout);
 
        for (i = 0; i < IDX_COUNT; i++) {
-               if (!callout_drain(&sp->ch[i]))
-                       callout_stop(&sp->ch[i]);
+               callout_drain(&sp->ch[i]);
        }
-       if (!callout_drain(&sp->pap_my_to_ch))
-               callout_stop(&sp->pap_my_to_ch);
+       callout_drain(&sp->pap_my_to_ch);
+
        mtx_destroy(&sp->pp_cpq.ifq_mtx);
        mtx_destroy(&sp->pp_fastq.ifq_mtx);
        mtx_destroy(&sp->mtx);