소스 검색

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>
Stefan Roese 17 년 전
부모
커밋
f34ebab68a
1개의 변경된 파일4개의 추가작업 그리고 1개의 파일을 삭제
  1. 4 1
      drivers/net/ibm_newemac/core.c

+ 4 - 1
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;
 		rx_size = dev->rx_fifo_size_gige;
 
 
 		if (dev->ndev->mtu > ETH_DATA_LEN) {
 		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;
 			dev->stop_timeout = STOP_TIMEOUT_1000_JUMBO;
 		} else
 		} else
 			dev->stop_timeout = STOP_TIMEOUT_1000;
 			dev->stop_timeout = STOP_TIMEOUT_1000;