From: Nicolas Kaiser <nikai@nikai.net>
Date: Thu, 7 Oct 2010 23:29:27 +0000 (+0000)
Subject: net/tg3: simplify conditional
X-Git-Tag: MMI-PSA29.97-13-9~21994^2~176
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2259dca36a2f0226596ea37132a46338fcff6722;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

net/tg3: simplify conditional

Simplify: ((a && !b) || (!a && b)) => (a != b)

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index e5b9ec5797c1..943c28325444 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -9968,8 +9968,7 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
 
 		if (!(phydev->supported & SUPPORTED_Pause) ||
 		    (!(phydev->supported & SUPPORTED_Asym_Pause) &&
-		     ((epause->rx_pause && !epause->tx_pause) ||
-		      (!epause->rx_pause && epause->tx_pause))))
+		     (epause->rx_pause != epause->tx_pause)))
 			return -EINVAL;
 
 		tp->link_config.flowctrl = 0;