diff --git a/[refs] b/[refs]
index 08c37beb3891..fb628d946938 100644
--- 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
index 9dcb5fd37371..c9069a28832b 100644
--- 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);