ethdev: make driver-only headers private

[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..d56009c 100644 (file)
--- a/drivers/net/mlx4/mlx4_intr.c
+++ b/drivers/net/mlx4/mlx4_intr.c
@@ -23,7 +23,7 @@
 
 #include <rte_alarm.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_io.h>
 #include <rte_interrupts.h>
 
@@ -124,9 +124,9 @@ mlx4_link_status_alarm(struct mlx4_priv *priv)
        MLX4_ASSERT(priv->intr_alarm == 1);
        priv->intr_alarm = 0;
        if (intr_conf->lsc && !mlx4_link_status_check(priv))
-               _rte_eth_dev_callback_process(ETH_DEV(priv),
-                                             RTE_ETH_EVENT_INTR_LSC,
-                                             NULL);
+               rte_eth_dev_callback_process(ETH_DEV(priv),
+                                            RTE_ETH_EVENT_INTR_LSC,
+                                            NULL);
 }
 
 /**
@@ -207,8 +207,8 @@ mlx4_interrupt_handler(struct mlx4_priv *priv)
        }
        for (i = 0; i != RTE_DIM(caught); ++i)
                if (caught[i])
-                       _rte_eth_dev_callback_process(ETH_DEV(priv), type[i],
-                                                     NULL);
+                       rte_eth_dev_callback_process(ETH_DEV(priv), type[i],
+                                                    NULL);
 }
 
 /**
@@ -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);
-               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;
-               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);