---

yaml --- r: 315387 b: refs/heads/master c: 9c64508 h: refs/heads/master i: 315385: eed5cd8 315383: da8fc19 v: v3
git-mirror · Jul 17, 2012 · 6817204 · 6817204
1 parent 0cf0770
commit 6817204
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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 */