1 files changed, 16 insertions, 19 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 7345c43b019e..bb536aa613f4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -644,6 +644,7 @@ static int mlx4_en_get_qp(struct mlx4_en_priv *priv)
                 goto alloc_err;
         }
         memcpy(entry->mac, priv->dev->dev_addr, sizeof(entry->mac));
+        memcpy(priv->current_mac, entry->mac, sizeof(priv->current_mac));
         entry->reg_id = reg_id;
 
         hlist_add_head_rcu(&entry->hlist,
@@ -760,21 +761,22 @@ static int mlx4_en_replace_mac(struct mlx4_en_priv *priv, int qpn,
         return __mlx4_replace_mac(dev, priv->port, qpn, new_mac_u64);
 }
 
-static int mlx4_en_do_set_mac(struct mlx4_en_priv *priv)
+static int mlx4_en_do_set_mac(struct mlx4_en_priv *priv,
+                              unsigned char new_mac[ETH_ALEN + 2])
 {
         int err = 0;
 
         if (priv->port_up) {
                 /* Remove old MAC and insert the new one */
                 err = mlx4_en_replace_mac(priv, priv->base_qpn,
-                                          priv->dev->dev_addr, priv->prev_mac);
+                                          new_mac, priv->current_mac);
                 if (err)
                         en_err(priv, "Failed changing HW MAC address\n");
         } else
                 en_dbg(HW, priv, "Port is down while registering mac, exiting...\n");
 
-        memcpy(priv->prev_mac, priv->dev->dev_addr,
-               sizeof(priv->prev_mac));
+        if (!err)
+                memcpy(priv->current_mac, new_mac, sizeof(priv->current_mac));
 
         return err;
 }
@@ -784,14 +786,17 @@ static int mlx4_en_set_mac(struct net_device *dev, void *addr)
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
         struct sockaddr *saddr = addr;
+        unsigned char new_mac[ETH_ALEN + 2];
         int err;
 
         if (!is_valid_ether_addr(saddr->sa_data))
                 return -EADDRNOTAVAIL;
 
         mutex_lock(&mdev->state_lock);
-        memcpy(dev->dev_addr, saddr->sa_data, ETH_ALEN);
-        err = mlx4_en_do_set_mac(priv);
+        memcpy(new_mac, saddr->sa_data, ETH_ALEN);
+        err = mlx4_en_do_set_mac(priv, new_mac);
+        if (!err)
+                memcpy(dev->dev_addr, saddr->sa_data, ETH_ALEN);
         mutex_unlock(&mdev->state_lock);
 
         return err;
@@ -940,11 +945,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 +993,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,
@@ -1166,7 +1161,8 @@ static void mlx4_en_do_uc_filter(struct mlx4_en_priv *priv,
                         }
 
                         /* MAC address of the port is not in uc list */
-                        if (ether_addr_equal_64bits(entry->mac, dev->dev_addr))
+                        if (ether_addr_equal_64bits(entry->mac,
+                                                    priv->current_mac))
                                 found = true;
 
                         if (!found) {
@@ -1476,7 +1472,7 @@ static void mlx4_en_do_get_stats(struct work_struct *work)
                 queue_delayed_work(mdev->workqueue, &priv->stats_task, STATS_DELAY);
         }
         if (mdev->mac_removed[MLX4_MAX_PORTS + 1 - priv->port]) {
-                mlx4_en_do_set_mac(priv);
+                mlx4_en_do_set_mac(priv, priv->current_mac);
                 mdev->mac_removed[MLX4_MAX_PORTS + 1 - priv->port] = 0;
         }
         mutex_unlock(&mdev->state_lock);
@@ -2469,6 +2465,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         priv->port = port;
         priv->port_up = false;
         priv->flags = prof->flags;
+        priv->pflags = MLX4_EN_PRIV_FLAGS_BLUEFLAME;
         priv->ctrl_flags = cpu_to_be32(MLX4_WQE_CTRL_CQ_UPDATE |
                         MLX4_WQE_CTRL_SOLICITED);
         priv->num_tx_rings_p_up = mdev->profile.num_tx_rings_p_up;
@@ -2535,7 +2532,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
                 }
         }
 
-        memcpy(priv->prev_mac, dev->dev_addr, sizeof(priv->prev_mac));
+        memcpy(priv->current_mac, dev->dev_addr, sizeof(priv->current_mac));
 
         priv->stride = roundup_pow_of_two(sizeof(struct mlx4_en_rx_desc) +
                                           DS_SIZE * MLX4_EN_MAX_RX_FRAGS);