svn commit: r352481 - stable/11/sys/net

[Hans Petter Selasky]

Author: hselasky
Date: Wed Sep 18 07:32:15 2019
New Revision: 352481
URL: https://svnweb.freebsd.org/changeset/base/352481

Log:
  MFC r352137:
  Callout drain does not have to be followed by a callout stop call.
  Fix bogus code.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/11/sys/net/if_spppsubr.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/net/if_spppsubr.c
==============================================================================
--- stable/11/sys/net/if_spppsubr.c	Wed Sep 18 07:31:31 2019	(r352480)
+++ stable/11/sys/net/if_spppsubr.c	Wed Sep 18 07:32:15 2019	(r352481)
@@ -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);