diff options
| author | Noa Osherovich <noaos@mellanox.com> | 2014-07-08 11:25:24 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-08 19:58:45 -0700 |
| commit | 2695bab2a6a18f31839c4e862eba3b450c0d2868 (patch) | |
| tree | 21d8b55f81282fecf3c4c7bbe3880f508368abbd /drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | |
| parent | d5b8dff0073d782f3169e510fd9445f1f56994e2 (diff) | |
| download | op-kernel-dev-2695bab2a6a18f31839c4e862eba3b450c0d2868.zip op-kernel-dev-2695bab2a6a18f31839c4e862eba3b450c0d2868.tar.gz | |
net/mlx4_en: Fix mac_hash database inconsistency
Using a local copy of dev_addr in mlx4_en_set_mac() to prevent dev_addr
from being modified during error flow or when dev_addr is modified in
another context (which is another problem that is being discussed over
the mailing list [1]).
Also fixing bad naming of priv->prev_mac into priv->current_mac.
[1] - http://patchwork.ozlabs.org/patch/351489/
Reviewed-by: Eyal Perry <eyalpe@mellanox.com>
Signed-off-by: Noa Osherovich <noaos@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/mlx4_en.h')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h index 01011d4..7c1b5ec 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h @@ -530,7 +530,7 @@ struct mlx4_en_priv { int registered; int allocated; int stride; - unsigned char prev_mac[ETH_ALEN + 2]; + unsigned char current_mac[ETH_ALEN + 2]; int mac_index; unsigned max_mtu; int base_qpn; |
