[PATCH 1/6] ibm_newemac: Fix problem with jumbo frame support and EMAC V4.patch

[Jeff Garzik]

Benjamin Herrenschmidt wrote:
> From: Stefan Roese <sr at 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 at denx.de>
> Signed-off-by: Benjamin Herrenschmidt <benh at 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