* [PATCH 1/6] ibm_newemac: Fix problem with jumbo frame support and EMAC V4.patch
@ 2008-04-22 0:46 Benjamin Herrenschmidt
2008-04-25 6:01 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Benjamin Herrenschmidt @ 2008-04-22 0:46 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linuxppc-dev
From: Stefan Roese <sr@denx.de>
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>
---
drivers/net/ibm_newemac/core.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 0789802..486901f 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;
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 1/6] ibm_newemac: Fix problem with jumbo frame support and EMAC V4.patch
2008-04-22 0:46 [PATCH 1/6] ibm_newemac: Fix problem with jumbo frame support and EMAC V4.patch Benjamin Herrenschmidt
@ 2008-04-25 6:01 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2008-04-25 6:01 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: netdev, linuxppc-dev
Benjamin Herrenschmidt wrote:
> From: Stefan Roese <sr@denx.de>
>
> 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>
>
> ---
> drivers/net/ibm_newemac/core.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
> index 0789802..486901f 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;
applied 1-6
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-04-25 6:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-22 0:46 [PATCH 1/6] ibm_newemac: Fix problem with jumbo frame support and EMAC V4.patch Benjamin Herrenschmidt
2008-04-25 6:01 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).