net/mlx4: revert multicast echo prevention

This reverts commit 8b3ffe95e75d6d305992505005cbb95969874a15.

Multicast loopback prevention is not part of the standard Verbs interface.
Remove it temporarily.

Signed-off-by: Moti Haimovsky <motih@mellanox.com>
Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>

diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile
index bd713e2..20692f0 100644 (file)
--- a/drivers/net/mlx4/Makefile
+++ b/drivers/net/mlx4/Makefile
@@ -91,11 +91,7 @@ mlx4_autoconf.h.new: FORCE
 
 mlx4_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
        $Q $(RM) -f -- '$@'
-       $Q sh -- '$<' '$@' \
-               HAVE_EXP_QP_BURST_CREATE_DISABLE_ETH_LOOPBACK \
-               infiniband/verbs.h \
-               enum IBV_EXP_QP_BURST_CREATE_DISABLE_ETH_LOOPBACK \
-               $(AUTOCONF_OUTPUT)
+       $Q : > '$@'
 
 # Create mlx4_autoconf.h or update it in case it differs from the new one.
 

diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index 7dbed93..5abfb37 100644 (file)
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -1266,13 +1266,6 @@ txq_setup(struct rte_eth_dev *dev, struct txq *txq, uint16_t desc,
                .intf_scope = IBV_EXP_INTF_GLOBAL,
                .intf = IBV_EXP_INTF_QP_BURST,
                .obj = tmpl.qp,
-#ifdef HAVE_EXP_QP_BURST_CREATE_DISABLE_ETH_LOOPBACK
-               /* MC loopback must be disabled when not using a VF. */
-               .family_flags =
-                       (!priv->vf ?
-                        IBV_EXP_QP_BURST_CREATE_DISABLE_ETH_LOOPBACK :
-                        0),
-#endif
        };
        tmpl.if_qp = ibv_exp_query_intf(priv->ctx, &attr.params, &status);
        if (tmpl.if_qp == NULL) {