From 765610d06686cba3b411bc4b08b0f6a295ed4085 Mon Sep 17 00:00:00 2001
From: Nicolas Kaiser <nikai@nikai.net>
Date: Thu, 7 Oct 2010 23:29:27 +0000
Subject: [PATCH] --- yaml --- r: 215126 b: refs/heads/master c:
 2259dca36a2f0226596ea37132a46338fcff6722 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 60bbdc19473f..36b4271a441d 100644
--- 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
index e5b9ec5797c1..943c28325444 100644
--- 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;