diff options
| author | Stefan Roese <sr@denx.de> | 2008-04-22 00:46:42 (GMT) |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-25 06:08:05 (GMT) |
| commit | f34ebab68a8e3c80ff4364f4c61734faec5161d4 (patch) | |
| tree | d222907ba8f081425e6f1124692d589423afe188 /drivers/net | |
| parent | f014e97ec6a447184f48a9d43432ab2ad1ffc7d8 (diff) | |
| download | linux-f34ebab68a8e3c80ff4364f4c61734faec5161d4.tar.xz | |
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')
| -rw-r--r-- | drivers/net/ibm_newemac/core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index 378a239..f10c762 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) rx_size = dev->rx_fifo_size_gige; if (dev->ndev->mtu > ETH_DATA_LEN) { - mr1 |= EMAC_MR1_JPSM; + if (emac_has_feature(dev, EMAC_FTR_EMAC4)) + mr1 |= EMAC4_MR1_JPSM; + else + mr1 |= EMAC_MR1_JPSM; dev->stop_timeout = STOP_TIMEOUT_1000_JUMBO; } else dev->stop_timeout = STOP_TIMEOUT_1000; |