net/mlx4_en: Do not disable vlan filter during promiscuous mode

Promiscous mode is only for MACs.
Should not disable/enable VLAN filter when entering/leaving promisuous mode.

Signed-off-by: Aviad Yehezkel <aviadye@mellanox.co.il>
Signed-off-by: Eugenia Emantayev <eugenia@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 7d4fb7bf25933ddcddecebf0a551bbe4cfa6328a..255950adcc6b4a0ce4f667dbc43f6e3067d79640 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -940,11 +940,6 @@ static void mlx4_en_set_promisc_mode(struct mlx4_en_priv *priv,
                                          0, MLX4_MCAST_DISABLE);
                if (err)
                        en_err(priv, "Failed disabling multicast filter\n");
-
-               /* Disable port VLAN filter */
-               err = mlx4_SET_VLAN_FLTR(mdev->dev, priv);
-               if (err)
-                       en_err(priv, "Failed disabling VLAN filter\n");
        }
 }
 
@@ -993,11 +988,6 @@ static void mlx4_en_clear_promisc_mode(struct mlx4_en_priv *priv,
                        en_err(priv, "Failed disabling promiscuous mode\n");
                break;
        }
-
-       /* Enable port VLAN filter */
-       err = mlx4_SET_VLAN_FLTR(mdev->dev, priv);
-       if (err)
-               en_err(priv, "Failed enabling VLAN filter\n");
 }
 
 static void mlx4_en_do_multicast(struct mlx4_en_priv *priv,