aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ibm_newemac
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-04-21 20:46:42 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-25 02:08:05 -0400
commitf34ebab68a8e3c80ff4364f4c61734faec5161d4 (patch)
treed222907ba8f081425e6f1124692d589423afe188 /drivers/net/ibm_newemac
parentf014e97ec6a447184f48a9d43432ab2ad1ffc7d8 (diff)
ibm_newemac: Fix problem with jumbo frame support and EMAC V4.patch
This fixes the jumbo frame support on EMAC V4 systems. Now the correct bit is set depending on the EMAC version configured. Tested on Kilauea (405EX) and Canyonlands (460EX). Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/ibm_newemac')
-rw-r--r--drivers/net/ibm_newemac/core.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 378a23963495..f10c762fd0b2 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -524,7 +524,10 @@ static int emac_configure(struct emac_instance *dev)
524 rx_size = dev->rx_fifo_size_gige; 524 rx_size = dev->rx_fifo_size_gige;
525 525
526 if (dev->ndev->mtu > ETH_DATA_LEN) { 526 if (dev->ndev->mtu > ETH_DATA_LEN) {
527 mr1 |= EMAC_MR1_JPSM; 527 if (emac_has_feature(dev, EMAC_FTR_EMAC4))
528 mr1 |= EMAC4_MR1_JPSM;
529 else
530 mr1 |= EMAC_MR1_JPSM;
528 dev->stop_timeout = STOP_TIMEOUT_1000_JUMBO; 531 dev->stop_timeout = STOP_TIMEOUT_1000_JUMBO;
529 } else 532 } else
530 dev->stop_timeout = STOP_TIMEOUT_1000; 533 dev->stop_timeout = STOP_TIMEOUT_1000;