summaryrefslogtreecommitdiffstats
path: root/sys/netgraph
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2005-01-11 12:20:28 +0000
committerglebius <glebius@FreeBSD.org>2005-01-11 12:20:28 +0000
commitab09c825512ce3d1f543acb77856c965a4ed493b (patch)
treea59523d63eba12d5151ea5418115c1c787ad75d3 /sys/netgraph
parentea3239f358f08c54ccdd1c92c60376244d3f13ef (diff)
downloadFreeBSD-src-ab09c825512ce3d1f543acb77856c965a4ed493b.zip
FreeBSD-src-ab09c825512ce3d1f543acb77856c965a4ed493b.tar.gz
Utilize callout_pending() macro
Diffstat (limited to 'sys/netgraph')
-rw-r--r--sys/netgraph/ng_ppp.c4
-rw-r--r--sys/netgraph/ng_pptpgre.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index 2173427..e53499b 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 c48d770..13b4059 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 */
OpenPOWER on IntegriCloud