---

yaml --- r: 215126 b: refs/heads/master c: 2259dca h: refs/heads/master v: v3
git-mirror · Oct 9, 2010 · 765610d · 765610d
1 parent a111994
commit 765610d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa3bc6c68e3c1064969f5f2962be84491ffb69a0
+refs/heads/master: 2259dca36a2f0226596ea37132a46338fcff6722
diff --git a/trunk/drivers/net/tg3.c b/trunk/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;