mlx4_en: Enabling new steering

The mlx4_en module now uses the new steering mechanism.
The RX packets are now steered through the MCG table instead
of Mac table for unicast, and default entry for multicast.
The feature is enabled through INIT_HCA

Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 10 deletions

diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c
index 570f2508fb30..05998ee297c9 100644
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
@@ -845,16 +845,10 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
         }
 
         /* Configure RSS indirection qp */
-        err = mlx4_qp_reserve_range(mdev->dev, 1, 1, &priv->base_qpn);
-        if (err) {
-                en_err(priv, "Failed to reserve range for RSS "
-                             "indirection qp\n");
-                goto rss_err;
-        }
         err = mlx4_qp_alloc(mdev->dev, priv->base_qpn, &rss_map->indir_qp);
         if (err) {
                 en_err(priv, "Failed to allocate RSS indirection QP\n");
-                goto reserve_err;
+                goto rss_err;
         }
         rss_map->indir_qp.event = mlx4_en_sqp_event;
         mlx4_en_fill_qp_context(priv, 0, 0, 0, 1, priv->base_qpn,
@@ -881,8 +875,6 @@ indir_err:
                        MLX4_QP_STATE_RST, NULL, 0, 0, &rss_map->indir_qp);
         mlx4_qp_remove(mdev->dev, &rss_map->indir_qp);
         mlx4_qp_free(mdev->dev, &rss_map->indir_qp);
-reserve_err:
-        mlx4_qp_release_range(mdev->dev, priv->base_qpn, 1);
 rss_err:
         for (i = 0; i < good_qps; i++) {
                 mlx4_qp_modify(mdev->dev, NULL, rss_map->state[i],
@@ -904,7 +896,6 @@ void mlx4_en_release_rss_steer(struct mlx4_en_priv *priv)
                        MLX4_QP_STATE_RST, NULL, 0, 0, &rss_map->indir_qp);
         mlx4_qp_remove(mdev->dev, &rss_map->indir_qp);
         mlx4_qp_free(mdev->dev, &rss_map->indir_qp);
-        mlx4_qp_release_range(mdev->dev, priv->base_qpn, 1);
 
         for (i = 0; i < priv->rx_ring_num; i++) {
                 mlx4_qp_modify(mdev->dev, NULL, rss_map->state[i],