From a1119948775c80aef3fa1627a265e305fdc2e7ca Mon Sep 17 00:00:00 2001
From: Nicolas Kaiser <nikai@nikai.net>
Date: Thu, 7 Oct 2010 13:14:50 +0000
Subject: [PATCH] --- yaml --- r: 215125 b: refs/heads/master c:
 aa3bc6c68e3c1064969f5f2962be84491ffb69a0 h: refs/heads/master i:   215123:
 829f67346995aa52b00e98623cd5176c8e53779f v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/ehea/ehea_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f29f8f4c045e..60bbdc19473f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e18434c45765cfc4a74b5c61da9e9fbc6ddd3d5f
+refs/heads/master: aa3bc6c68e3c1064969f5f2962be84491ffb69a0
diff --git a/trunk/drivers/net/ehea/ehea_main.c b/trunk/drivers/net/ehea/ehea_main.c
index 15401af30108..6932578816d3 100644
--- a/trunk/drivers/net/ehea/ehea_main.c
+++ b/trunk/drivers/net/ehea/ehea_main.c
@@ -1918,7 +1918,7 @@ static void ehea_promiscuous(struct net_device *dev, int enable)
 	struct hcp_ehea_port_cb7 *cb7;
 	u64 hret;
 
-	if ((enable && port->promisc) || (!enable && !port->promisc))
+	if (enable == port->promisc)
 		return;
 
 	cb7 = (void *)get_zeroed_page(GFP_ATOMIC);