Page MenuHomeFreeBSD
Files F95949042

D31476.diff
No OneTemporary
Actions

D31476.diff
View Options

diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.c b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
@@ -391,7 +391,7 @@
panic(
"%s: %s - No command timeout!\n", __func__, NG_NODE_NAME(unit->node));
- if (ng_uncallout(&unit->cmd_timo, unit->node) == 0)
+ if (ng_uncallout(&unit->cmd_timo, unit->node) < 1)
return (ETIMEDOUT);
unit->state &= ~NG_HCI_UNIT_COMMAND_PENDING;
@@ -432,7 +432,7 @@
panic(
"%s: %s - No connection timeout!\n", __func__, NG_NODE_NAME(con->unit->node));
- if (ng_uncallout(&con->con_timo, con->unit->node) == 0)
+ if (ng_uncallout(&con->con_timo, con->unit->node) < 1)
return (ETIMEDOUT);
con->flags &= ~NG_HCI_CON_TIMEOUT_PENDING;
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
@@ -235,7 +235,7 @@
__func__, NG_NODE_NAME(con->l2cap->node),
con->state, con->flags);
- if (ng_uncallout(&con->con_timo, con->l2cap->node) == 0)
+ if (ng_uncallout(&con->con_timo, con->l2cap->node) < 1)
return (ETIMEDOUT);
con->flags &= ~NG_L2CAP_CON_AUTO_DISCON_TIMO;
@@ -534,7 +534,7 @@
__func__, NG_NODE_NAME(con->l2cap->node),
con->state, con->flags);
- if (ng_uncallout(&con->con_timo, con->l2cap->node) == 0)
+ if (ng_uncallout(&con->con_timo, con->l2cap->node) < 1)
return (ETIMEDOUT);
con->flags &= ~NG_L2CAP_CON_LP_TIMO;
@@ -579,7 +579,7 @@
__func__, NG_NODE_NAME(cmd->con->l2cap->node),
cmd->code, cmd->flags);
- if (ng_uncallout(&cmd->timo, cmd->con->l2cap->node) == 0)
+ if (ng_uncallout(&cmd->timo, cmd->con->l2cap->node) < 1)
return (ETIMEDOUT);
cmd->flags &= ~NG_L2CAP_CMD_PENDING;
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c
--- a/sys/netgraph/ng_base.c
+++ b/sys/netgraph/ng_base.c
@@ -3840,11 +3840,7 @@
}
c->c_arg = NULL;
- /*
- * Callers only want to know if the callout was cancelled and
- * not draining or stopped.
- */
- return (rval > 0);
+ return (rval);
}
/*

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 24, 3:15 AM (21 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
12623074
Default Alt Text
D31476.diff (2 KB)

Event Timeline