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/netpfil | |
| 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/netpfil')
| -rw-r--r-- | sys/netpfil/pf/if_pfsync.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 516a92a..09d707c 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -352,7 +352,7 @@ pfsync_clone_destroy(struct ifnet *ifp) TAILQ_REMOVE(&sc->sc_deferrals, pd, pd_entry); sc->sc_deferred--; - if (callout_stop(&pd->pd_tmo)) { + if (callout_stop(&pd->pd_tmo) > 0) { pf_release_state(pd->pd_st); m_freem(pd->pd_m); free(pd, M_PFSYNC); @@ -1775,7 +1775,7 @@ pfsync_undefer_state(struct pf_state *st, int drop) TAILQ_FOREACH(pd, &sc->sc_deferrals, pd_entry) { if (pd->pd_st == st) { - if (callout_stop(&pd->pd_tmo)) + if (callout_stop(&pd->pd_tmo) > 0) pfsync_undefer(pd, drop); return; } |
