From dc2f4d7f5fc8309d9e48b85811e241bd95a44048 Mon Sep 17 00:00:00 2001 From: Gleb Smirnoff Date: Tue, 11 Jan 2005 12:20:28 +0000 Subject: [PATCH] Utilize callout_pending() macro --- sys/netgraph/ng_ppp.c | 4 ++-- sys/netgraph/ng_pptpgre.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c index 21734273f7b..e53499ba1ad 100644 --- a/sys/netgraph/ng_ppp.c +++ b/sys/netgraph/ng_ppp.c @@ -2025,7 +2025,7 @@ ng_ppp_start_frag_timer(node_p node) { const priv_p priv = NG_NODE_PRIVATE(node); - if (!(priv->fragTimer.c_flags & CALLOUT_PENDING)) + if (!(callout_pending(&priv->fragTimer))) ng_callout(&priv->fragTimer, node, NULL, MP_FRAGTIMER_INTERVAL, ng_ppp_frag_timeout, NULL, 0); } @@ -2038,6 +2038,6 @@ ng_ppp_stop_frag_timer(node_p node) { const priv_p priv = NG_NODE_PRIVATE(node); - if (priv->fragTimer.c_flags & CALLOUT_PENDING) + if (callout_pending(&priv->fragTimer)) ng_uncallout(&priv->fragTimer, node); } diff --git a/sys/netgraph/ng_pptpgre.c b/sys/netgraph/ng_pptpgre.c index c48d77022b0..13b405957dd 100644 --- a/sys/netgraph/ng_pptpgre.c +++ b/sys/netgraph/ng_pptpgre.c @@ -702,7 +702,7 @@ badAck: priv->recvSeq = seq; /* We need to acknowledge this packet; do it soon... */ - if (!(a->sackTimer.c_flags & CALLOUT_PENDING)) { + if (!(callout_pending(&a->sackTimer))) { int maxWait; /* Take 1/4 of the estimated round trip time */