---

yaml --- r: 74473 b: refs/heads/master c: 485982a h: refs/heads/master i: 74471: 157e717 v: v3
git-mirror · Dec 1, 2007 · 30c5e2a · 30c5e2a
1 parent 2de515e
commit 30c5e2a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21d7f67700ad7a4523d35d43ce95755e40eae5b7
+refs/heads/master: 485982a99a8a0b547aebedc3d0017dbffc3a44c0
diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c
@@ -1633,15 +1633,14 @@ static void genesis_mac_init(struct skge_hw *hw, int port)
 	}
 	xm_write16(hw, port, XM_RX_CMD, r);
 
-
 	/* We want short frames padded to 60 bytes. */
 	xm_write16(hw, port, XM_TX_CMD, XM_TX_AUTO_PAD);
 
-	/*
-	 * Bump up the transmit threshold. This helps hold off transmit
-	 * underruns when we're blasting traffic from both ports at once.
-	 */
-	xm_write16(hw, port, XM_TX_THR, 512);
+	/* Increase threshold for jumbo frames on dual port */
+	if (hw->ports > 1 && jumbo)
+		xm_write16(hw, port, XM_TX_THR, 1020);
+	else
+		xm_write16(hw, port, XM_TX_THR, 512);
 
 	/*
 	 * Enable the reception of all error frames. This is is