Date: Wed, 18 Sep 2019 07:31:31 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r352480 - stable/12/sys/net Message-ID: <201909180731.x8I7VVTT009972@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Wed Sep 18 07:31:31 2019 New Revision: 352480 URL: https://svnweb.freebsd.org/changeset/base/352480 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/12/sys/net/if_spppsubr.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/net/if_spppsubr.c ============================================================================== --- stable/12/sys/net/if_spppsubr.c Wed Sep 18 07:29:33 2019 (r352479) +++ stable/12/sys/net/if_spppsubr.c Wed Sep 18 07:31:31 2019 (r352480) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909180731.x8I7VVTT009972>