---

yaml --- r: 74485 b: refs/heads/master c: e970d1f h: refs/heads/master i: 74483: 8515aae v: v3
git-mirror · Dec 1, 2007 · 0a29d67 · 0a29d67
1 parent a5ebb36
commit 0a29d67
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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 */