diff options
| author |   Yan Burman <yanb@mellanox.com> | 2013-02-07 02:25:24 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-02-07 23:26:13 -0500 |
| commit | 90bbb74af68b3255bc298731f8b60d5668877306 (patch) | |
| tree | 86251108c85013b563eb4a28ca6878eba0f28223 /drivers/net/ethernet/mellanox/mlx4/en_netdev.c | |
| parent | net/mlx4_en: Re-arrange ndo_set_rx_mode related code (diff) | |
| download | linux-dev-90bbb74af68b3255bc298731f8b60d5668877306.tar.xz linux-dev-90bbb74af68b3255bc298731f8b60d5668877306.zip | |
net/mlx4_en: Save previous MAC address of the port so we can replace it later
In preparation to having more than one unicast MAC per port, we need to keep track
of the previous MAC address in the flow of ndo_set_mac_address,
so that mlx4_en_replace_mac will know what to replace.
Signed-off-by: Yan Burman <yanb@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index 80067d572c0c..72a3fe50d429 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -591,7 +591,7 @@ static void mlx4_en_put_qp(struct mlx4_en_priv *priv) } static int mlx4_en_replace_mac(struct mlx4_en_priv *priv, int qpn, - unsigned char *new_mac) + unsigned char *new_mac, unsigned char *prev_mac) { struct mlx4_en_dev *mdev = priv->mdev; struct mlx4_dev *dev = mdev->dev; @@ -657,7 +657,7 @@ static void mlx4_en_do_set_mac(struct work_struct *work) 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->dev->dev_addr, priv->prev_mac); if (err) en_err(priv, "Failed changing HW MAC address\n"); memcpy(priv->prev_mac, priv->dev->dev_addr, |