From e2c054fcdd742f5ab305a34d7a65c9c9bb8f26a1 Mon Sep 17 00:00:00 2001
From: Gary Zambrano <zambrano@broadcom.com>
Date: Mon, 10 Apr 2006 12:02:21 -0700
Subject: [PATCH] --- yaml --- r: 25680 b: refs/heads/master c:
 2b474cf53870abf1bbad631c3368b9efc9b5ba9d h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/net/b44.c | 31 ++++++++++++-------------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 4a599e350ce0..d618b7b8f890 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4be5de25259de21894df5e2fecc30da8252dee8c
+refs/heads/master: 2b474cf53870abf1bbad631c3368b9efc9b5ba9d
diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c
index c4e12b5cbb92..a67d537ccf49 100644
--- a/trunk/drivers/net/b44.c
+++ b/trunk/drivers/net/b44.c
@@ -410,25 +410,18 @@ static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags)
 
 static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote)
 {
-	u32 pause_enab = bp->flags & (B44_FLAG_TX_PAUSE |
-				      B44_FLAG_RX_PAUSE);
-
-	if (local & ADVERTISE_PAUSE_CAP) {
-		if (local & ADVERTISE_PAUSE_ASYM) {
-			if (remote & LPA_PAUSE_CAP)
-				pause_enab |= (B44_FLAG_TX_PAUSE |
-					       B44_FLAG_RX_PAUSE);
-			else if (remote & LPA_PAUSE_ASYM)
-				pause_enab |= B44_FLAG_RX_PAUSE;
-		} else {
-			if (remote & LPA_PAUSE_CAP)
-				pause_enab |= (B44_FLAG_TX_PAUSE |
-					       B44_FLAG_RX_PAUSE);
-		}
-	} else if (local & ADVERTISE_PAUSE_ASYM) {
-		if ((remote & LPA_PAUSE_CAP) &&
-		    (remote & LPA_PAUSE_ASYM))
-			pause_enab |= B44_FLAG_TX_PAUSE;
+	u32 pause_enab = 0; 
+
+	/* The driver supports only rx pause by default because
+	   the b44 mac tx pause mechanism generates excessive 
+	   pause frames. 	   
+	   Use ethtool to turn on b44 tx pause if necessary.
+	 */
+	if ((local & ADVERTISE_PAUSE_CAP) &&
+	    (local & ADVERTISE_PAUSE_ASYM)){ 
+		if ((remote & LPA_PAUSE_ASYM) &&
+		    !(remote & LPA_PAUSE_CAP))
+			pause_enab |= B44_FLAG_RX_PAUSE;
 	}
 
 	__b44_set_flow_ctrl(bp, pause_enab);