Utilize callout_pending() macro

This commit is contained in:
Gleb Smirnoff 2005-01-11 12:20:28 +00:00
parent 7164e8f291
commit dc2f4d7f5f
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=140068
2 changed files with 3 additions and 3 deletions

View File

@ -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);
}

View File

@ -702,7 +702,7 @@ ng_pptpgre_recv(node_p node, item_p item)
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 */