From 8d8f30f3ae0b9e8f7db63328aedea8936cdd7048 Mon Sep 17 00:00:00 2001 From: Alexander Guller Date: Mon, 19 Dec 2011 04:02:58 +0000 Subject: [PATCH] --- yaml --- r: 279009 b: refs/heads/master c: 0e03567a2c2542e142d5ab6c8bcbf6373a241afe h: refs/heads/master i: 279007: 47bcdd345fa1617699572abab89687d099ff0f0c v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e5617c8d3a57..0c7e612220bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d0fc7b61191c9433a4f738987b89e1d962eb637 +refs/heads/master: 0e03567a2c2542e142d5ab6c8bcbf6373a241afe diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index 1db6fea495bf..72fa807b69ce 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -151,6 +151,7 @@ static void mlx4_en_clear_list(struct net_device *dev) struct mlx4_en_priv *priv = netdev_priv(dev); kfree(priv->mc_addrs); + priv->mc_addrs = NULL; priv->mc_addrs_cnt = 0; } @@ -170,6 +171,7 @@ static void mlx4_en_cache_mclist(struct net_device *dev) i = 0; netdev_for_each_mc_addr(ha, dev) memcpy(mc_addrs + i++ * ETH_ALEN, ha->addr, ETH_ALEN); + mlx4_en_clear_list(dev); priv->mc_addrs = mc_addrs; priv->mc_addrs_cnt = mc_addrs_cnt; }