net/tg3: simplify conditional
authorNicolas Kaiser <nikai@nikai.net>
Thu, 7 Oct 2010 23:29:27 +0000 (23:29 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 9 Oct 2010 16:22:54 +0000 (09:22 -0700)
Simplify: ((a && !b) || (!a && b)) => (a != b)

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

index e5b9ec5797c19b2a1544a7ff5aa11c7f68a7e24a..943c28325444f95003260826d6cbf285b27afcd4 100644 (file)
@@ -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;