From 011dd7183c9eb4b617fc74d55a2582c2d6bf131d Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Tue, 22 Apr 2008 10:46:42 +1000 Subject: [PATCH] --- yaml --- r: 93104 b: refs/heads/master c: f34ebab68a8e3c80ff4364f4c61734faec5161d4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ibm_newemac/core.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 700e322a9b4a..f93ad792d535 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f014e97ec6a447184f48a9d43432ab2ad1ffc7d8 +refs/heads/master: f34ebab68a8e3c80ff4364f4c61734faec5161d4 diff --git a/trunk/drivers/net/ibm_newemac/core.c b/trunk/drivers/net/ibm_newemac/core.c index 378a23963495..f10c762fd0b2 100644 --- a/trunk/drivers/net/ibm_newemac/core.c +++ b/trunk/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;