From 68172041e0456717c4895af1f0835fd25a14f692 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 10 Jul 2012 20:34:07 +0000 Subject: [PATCH] --- yaml --- r: 315387 b: refs/heads/master c: 9c64508af2c171f57a198729c59a7a6f6998b3a1 h: refs/heads/master i: 315385: eed5cd8214e233018d11b9d881c541a0671d6c27 315383: da8fc19460f2bb99377b451dc030b38c4fec8035 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5f2a5caa9c97..f28660c326d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 447458c01f4c765ab37ac7b380e60d977daae4c5 +refs/heads/master: 9c64508af2c171f57a198729c59a7a6f6998b3a1 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index 94375a8c6d42..4ce5ca81a010 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -503,9 +503,7 @@ static void mlx4_en_do_set_multicast(struct work_struct *work) /* remove from list */ list_del(&mclist->list); kfree(mclist); - } - - if (mclist->action == MCLIST_ADD) { + } else if (mclist->action == MCLIST_ADD) { /* attach the address */ memcpy(&mc_list[10], mclist->addr, ETH_ALEN); /* needed for B0 steering support */