git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/mlx4: fix premature disabling of interrupt
[dpdk.git]
/
drivers
/
net
/
mlx4
/
mlx4_intr.c
diff --git
a/drivers/net/mlx4/mlx4_intr.c
b/drivers/net/mlx4/mlx4_intr.c
index
020fc25
..
19af935
100644
(file)
--- a/
drivers/net/mlx4/mlx4_intr.c
+++ b/
drivers/net/mlx4/mlx4_intr.c
@@
-326,13
+326,20
@@
mlx4_rx_intr_disable(struct rte_eth_dev *dev, uint16_t idx)
} else {
ret = mlx4_glue->get_cq_event(rxq->cq->channel, &ev_cq,
&ev_ctx);
} else {
ret = mlx4_glue->get_cq_event(rxq->cq->channel, &ev_cq,
&ev_ctx);
- if (ret || ev_cq != rxq->cq)
+ /** For non-zero ret save the errno (may be EAGAIN
+ * which means the get_cq_event function was called before
+ * receiving one).
+ */
+ if (ret)
+ ret = errno;
+ else if (ev_cq != rxq->cq)
ret = EINVAL;
}
if (ret) {
rte_errno = ret;
ret = EINVAL;
}
if (ret) {
rte_errno = ret;
- WARN("unable to disable interrupt on rx queue %d",
- idx);
+ if (ret != EAGAIN)
+ WARN("unable to disable interrupt on rx queue %d",
+ idx);
} else {
rxq->mcq.arm_sn++;
mlx4_glue->ack_cq_events(rxq->cq, 1);
} else {
rxq->mcq.arm_sn++;
mlx4_glue->ack_cq_events(rxq->cq, 1);