From 59c91d2a933c96fc3c2f4c39ebd6e2a5ce83fe26 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 29 Apr 2009 08:15:05 +0000
Subject: [PATCH] --- yaml --- r: 150069 b: refs/heads/master c:
 44c22ee91b56d7cad3b48c439dd96aad2e910fbc h: refs/heads/master i:   150067:
 4da25b4ff3a59b608dccbae93dbbadc9cf6b4bcf v: v3

---
 [refs]                    |  2 +-
 trunk/include/linux/mii.h | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 38a9ac4426c1..235009ab283b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4023939667a906f0c02022ce7ec06d6512470211
+refs/heads/master: 44c22ee91b56d7cad3b48c439dd96aad2e910fbc
diff --git a/trunk/include/linux/mii.h b/trunk/include/linux/mii.h
index ad748588faf1..14ecb2e114f1 100644
--- a/trunk/include/linux/mii.h
+++ b/trunk/include/linux/mii.h
@@ -250,18 +250,12 @@ static inline u8 mii_resolve_flowctrl_fdx(u16 lcladv, u16 rmtadv)
 {
 	u8 cap = 0;
 
-	if (lcladv & ADVERTISE_PAUSE_CAP) {
-		if (lcladv & ADVERTISE_PAUSE_ASYM) {
-			if (rmtadv & LPA_PAUSE_CAP)
-				cap = FLOW_CTRL_TX | FLOW_CTRL_RX;
-			else if (rmtadv & LPA_PAUSE_ASYM)
-				cap = FLOW_CTRL_RX;
-		} else {
-			if (rmtadv & LPA_PAUSE_CAP)
-				cap = FLOW_CTRL_TX | FLOW_CTRL_RX;
-		}
-	} else if (lcladv & ADVERTISE_PAUSE_ASYM) {
-		if ((rmtadv & LPA_PAUSE_CAP) && (rmtadv & LPA_PAUSE_ASYM))
+	if (lcladv & rmtadv & ADVERTISE_PAUSE_CAP) {
+		cap = FLOW_CTRL_TX | FLOW_CTRL_RX;
+	} else if (lcladv & rmtadv & ADVERTISE_PAUSE_ASYM) {
+		if (lcladv & ADVERTISE_PAUSE_CAP)
+			cap = FLOW_CTRL_RX;
+		else if (rmtadv & ADVERTISE_PAUSE_CAP)
 			cap = FLOW_CTRL_TX;
 	}