diff options
| author | rrs <rrs@FreeBSD.org> | 2015-11-13 22:51:35 +0000 |
|---|---|---|
| committer | rrs <rrs@FreeBSD.org> | 2015-11-13 22:51:35 +0000 |
| commit | dc494194a2039a69fc3073f4ef4d628b955a0b25 (patch) | |
| tree | 8d27e0d0e4a2ccb1fcf414f3765ec6a6e6de9611 /sys/netinet6 | |
| parent | e3347af437af55376a333371d3c62fb46c99b67d (diff) | |
| download | FreeBSD-src-dc494194a2039a69fc3073f4ef4d628b955a0b25.zip FreeBSD-src-dc494194a2039a69fc3073f4ef4d628b955a0b25.tar.gz | |
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.
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6.c | 2 | ||||
| -rw-r--r-- | sys/netinet6/nd6.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 65e7ab0..cae186d 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -2133,7 +2133,7 @@ in6_lltable_free_entry(struct lltable *llt, struct llentry *lle) lltable_unlink_entry(llt, lle); } - if (callout_stop(&lle->lle_timer)) + if (callout_stop(&lle->lle_timer) > 0) LLE_REMREF(lle); llentry_free(lle); diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 46f0923..b3fe002 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -508,7 +508,7 @@ nd6_llinfo_settimer_locked(struct llentry *ln, long tick) nd6_llinfo_timer, ln); } } - if (canceled) + if (canceled > 0) LLE_REMREF(ln); } |
