From dc494194a2039a69fc3073f4ef4d628b955a0b25 Mon Sep 17 00:00:00 2001 From: rrs Date: Fri, 13 Nov 2015 22:51:35 +0000 Subject: This fixes several places where callout_stops return is examined. The new return codes of -1 were mistakenly being considered "true". Callout_stop now returns -1 to indicate the callout had either already completed or was not running and 0 to indicate it could not be stopped. Also update the manual page to make it more consistent no non-zero in the callout_stop or callout_reset descriptions. MFC after: 1 Month with associated callout change. --- sys/net/if_llatbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/net/if_llatbl.c') diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c index 1c16b2d..0a89225 100644 --- a/sys/net/if_llatbl.c +++ b/sys/net/if_llatbl.c @@ -394,7 +394,7 @@ lltable_free(struct lltable *llt) IF_AFDATA_WUNLOCK(llt->llt_ifp); LIST_FOREACH_SAFE(lle, &dchain, lle_chain, next) { - if (callout_stop(&lle->lle_timer)) + if (callout_stop(&lle->lle_timer) > 0) LLE_REMREF(lle); llentry_free(lle); } -- cgit v1.1