From: Jack Morgenstein Date: Sun, 3 Nov 2013 08:04:07 +0000 (+0200) Subject: net/mlx4_core: Fix call to __mlx4_unregister_mac X-Git-Tag: firefly_0821_release~176^2~5062^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c32b7dfbb1dfb3f0a68f250deff65103c8bb704a;p=firefly-linux-kernel-4.4.55.git net/mlx4_core: Fix call to __mlx4_unregister_mac In function mlx4_master_deactivate_admin_state() __mlx4_unregister_mac was called using the MAC index. It should be called with the value of the MAC itself. Signed-off-by: Jack Morgenstein Signed-off-by: Or Gerlitz Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c index ea20182c6969..bb11624a1f39 100644 --- a/drivers/net/ethernet/mellanox/mlx4/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c @@ -1691,7 +1691,7 @@ static void mlx4_master_deactivate_admin_state(struct mlx4_priv *priv, int slave vp_oper->vlan_idx = NO_INDX; } if (NO_INDX != vp_oper->mac_idx) { - __mlx4_unregister_mac(&priv->dev, port, vp_oper->mac_idx); + __mlx4_unregister_mac(&priv->dev, port, vp_oper->state.mac); vp_oper->mac_idx = NO_INDX; } }