From 0a29d67d83c7190efe2f4034824d19608f85c1d4 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Tue, 27 Nov 2007 11:02:07 -0800
Subject: [PATCH] --- yaml --- r: 74485 b: refs/heads/master c:
 e970d1f8106514ea619d7a9005b1dc92c6049b32 h: refs/heads/master i:   74483:
 8515aae1351ac3fd85b3babb53a6c5d02fdb1938 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bc30f1a2e51c..eac2097a269d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7782c8c4d764dfe1b96e02e73d4d5f622fb4a389
+refs/heads/master: e970d1f8106514ea619d7a9005b1dc92c6049b32
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index a42f1c7ac18f..3d1dfc948405 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -845,6 +845,13 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
 		sky2_set_tx_stfwd(hw, port);
 	}
 
+	if (hw->chip_id == CHIP_ID_YUKON_FE_P &&
+	    hw->chip_rev == CHIP_REV_YU_FE2_A0) {
+		/* disable dynamic watermark */
+		reg = sky2_read16(hw, SK_REG(port, TX_GMF_EA));
+		reg &= ~TX_DYN_WM_ENA;
+		sky2_write16(hw, SK_REG(port, TX_GMF_EA), reg);
+	}
 }
 
 /* Assign Ram Buffer allocation to queue */