---

yaml --- r: 299939 b: refs/heads/master c: 47d59d0 h: refs/heads/master i: 299937: 90a940a 299935: 061ec06 v: v3
git-mirror · Apr 26, 2012 · 4496a9c · 4496a9c
1 parent c1bbe6b
commit 4496a9c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d384574e8bceb9bada323da8044ca43e621886b
+refs/heads/master: 47d59d01322f60d1c46fdf2650e0613daa8ce637
diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c b/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -1946,11 +1946,7 @@ static void ehea_set_multicast_list(struct net_device *dev)
 	struct netdev_hw_addr *ha;
 	int ret;
 
-	if (port->promisc) {
-		ehea_promiscuous(dev, 1);
-		return;
-	}
-	ehea_promiscuous(dev, 0);
+	ehea_promiscuous(dev, !!(dev->flags & IFF_PROMISC));
 
 	if (dev->flags & IFF_ALLMULTI) {
 		ehea_allmulti(dev, 1);