projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aa3bc6c
)
net/tg3: simplify conditional
author
Nicolas Kaiser
<nikai@nikai.net>
Thu, 7 Oct 2010 23:29:27 +0000
(23:29 +0000)
committer
David 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
patch
|
blob
|
blame
|
history
diff --git
a/drivers/net/tg3.c
b/drivers/net/tg3.c
index e5b9ec5797c19b2a1544a7ff5aa11c7f68a7e24a..943c28325444f95003260826d6cbf285b27afcd4 100644
(file)
--- 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;