From 30c5e2af7a8d77524b0e36c12fdbb9dfe1b0ee41 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 26 Nov 2007 11:54:52 -0800 Subject: [PATCH] --- yaml --- r: 74473 b: refs/heads/master c: 485982a99a8a0b547aebedc3d0017dbffc3a44c0 h: refs/heads/master i: 74471: 157e717c6810a326e6ac36a7224ab41b4cc6f49e v: v3 --- [refs] | 2 +- trunk/drivers/net/skge.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8b3bdff072c1..58bd347b8243 100644 --- 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 index 73a424694ac5..f7e0fbbd4ad6 100644 --- 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