net/mlx5: recover secondary process Rx errors

[dpdk.git] / drivers / net / mlx5 / mlx5_trigger.c

diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 7c1e559..864c985 100644 (file)
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -58,12 +58,6 @@ mlx5_txq_start(struct rte_eth_dev *dev)
                        goto error;
                }
        }
-       ret = mlx5_tx_uar_remap(dev, priv->sh->ctx->cmd_fd);
-       if (ret) {
-               /* Adjust index for rollback. */
-               i = priv->txqs_n - 1;
-               goto error;
-       }
        return 0;
 error:
        ret = rte_errno; /* Save rte_errno before cleanup. */
@@ -132,6 +126,7 @@ mlx5_rxq_start(struct rte_eth_dev *dev)
                rxq_ctrl->ibv = mlx5_rxq_ibv_new(dev, i);
                if (!rxq_ctrl->ibv)
                        goto error;
+               rxq_ctrl->wqn = rxq_ctrl->ibv->wq->wq_num;
        }
        return 0;
 error:
@@ -274,7 +269,7 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
                .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
        };
        const unsigned int vlan_filter_n = priv->vlan_filter_n;
-       const struct ether_addr cmp = {
+       const struct rte_ether_addr cmp = {
                .addr_bytes = "\x00\x00\x00\x00\x00\x00",
        };
        unsigned int i;
@@ -337,13 +332,13 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
        }
        /* Add MAC address flows. */
        for (i = 0; i != MLX5_MAX_MAC_ADDRESSES; ++i) {
-               struct ether_addr *mac = &dev->data->mac_addrs[i];
+               struct rte_ether_addr *mac = &dev->data->mac_addrs[i];
 
                if (!memcmp(mac, &cmp, sizeof(*mac)))
                        continue;
                memcpy(&unicast.dst.addr_bytes,
                       mac->addr_bytes,
-                      ETHER_ADDR_LEN);
+                      RTE_ETHER_ADDR_LEN);
                for (j = 0; j != vlan_filter_n; ++j) {
                        uint16_t vlan = priv->vlan_filter[j];