From b0fc115fbc4aa54d4d5998639e38ea26478552fd Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sun, 27 Mar 2011 01:01:26 +0000
Subject: [PATCH] --- yaml --- r: 243250 b: refs/heads/master c:
 b5845f9834d8f4c79d324bc59b99dbcf0a40f428 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/mlx4/en_netdev.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index aae907443deb..a66a7bf3cc12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6303e6e8da770e62a4d38f7206fe046514276d14
+refs/heads/master: b5845f9834d8f4c79d324bc59b99dbcf0a40f428
diff --git a/trunk/drivers/net/mlx4/en_netdev.c b/trunk/drivers/net/mlx4/en_netdev.c
index 5762ebde4455..4f158baa0246 100644
--- a/trunk/drivers/net/mlx4/en_netdev.c
+++ b/trunk/drivers/net/mlx4/en_netdev.c
@@ -742,6 +742,9 @@ int mlx4_en_start_port(struct net_device *dev)
 				  0, MLX4_PROT_ETH))
 		mlx4_warn(mdev, "Failed Attaching Broadcast\n");
 
+	/* Must redo promiscuous mode setup. */
+	priv->flags &= ~(MLX4_EN_FLAG_PROMISC | MLX4_EN_FLAG_MC_PROMISC);
+
 	/* Schedule multicast task to populate multicast list */
 	queue_work(mdev->workqueue, &priv->mcast_task);