aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/skge.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 73a424694ac5..f7e0fbbd4ad6 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -1633,15 +1633,14 @@ static void genesis_mac_init(struct skge_hw *hw, int port)
1633 } 1633 }
1634 xm_write16(hw, port, XM_RX_CMD, r); 1634 xm_write16(hw, port, XM_RX_CMD, r);
1635 1635
1636
1637 /* We want short frames padded to 60 bytes. */ 1636 /* We want short frames padded to 60 bytes. */
1638 xm_write16(hw, port, XM_TX_CMD, XM_TX_AUTO_PAD); 1637 xm_write16(hw, port, XM_TX_CMD, XM_TX_AUTO_PAD);
1639 1638
1640 /* 1639 /* Increase threshold for jumbo frames on dual port */
1641 * Bump up the transmit threshold. This helps hold off transmit 1640 if (hw->ports > 1 && jumbo)
1642 * underruns when we're blasting traffic from both ports at once. 1641 xm_write16(hw, port, XM_TX_THR, 1020);
1643 */ 1642 else
1644 xm_write16(hw, port, XM_TX_THR, 512); 1643 xm_write16(hw, port, XM_TX_THR, 512);
1645 1644
1646 /* 1645 /*
1647 * Enable the reception of all error frames. This is is 1646 * Enable the reception of all error frames. This is is