mirror of
https://github.com/torvalds/linux.git
synced 2024-11-13 23:51:39 +00:00
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>
This commit is contained in:
parent
f014e97ec6
commit
f34ebab68a
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user