24c24
< __FBSDID("$FreeBSD: head/sys/dev/nfe/if_nfe.c 170595 2007-06-12 02:35:01Z yongari $");
---
> __FBSDID("$FreeBSD: head/sys/dev/nfe/if_nfe.c 171559 2007-07-24 01:11:00Z yongari $");
111c111
< static int nfe_alloc_jrx_ring(struct nfe_softc *, struct nfe_jrx_ring *);
---
> static void nfe_alloc_jrx_ring(struct nfe_softc *, struct nfe_jrx_ring *);
153a154
> static int jumbo_disable = 0;
155a157
> TUNABLE_INT("hw.nfe.jumbo_disable", &jumbo_disable);
516,517c518
< if ((error = nfe_alloc_jrx_ring(sc, &sc->jrxq)) != 0)
< goto fail;
---
> nfe_alloc_jrx_ring(sc, &sc->jrxq);
1143c1144
< static int
---
> static void
1154c1155,1160
< return (0);
---
> return;
> if (jumbo_disable != 0) {
> device_printf(sc->nfe_dev, "disabling jumbo frame support\n");
> sc->nfe_jumbo_disable = 1;
> return;
> }
1304c1310
< return (0);
---
> return;
1306a1313,1316
> /*
> * Running without jumbo frame support is ok for most cases
> * so don't fail on creating dma tag/map for jumbo frame.
> */
1308c1318,1320
< return (error);
---
> device_printf(sc->nfe_dev, "disabling jumbo frame support due to "
> "resource shortage\n");
> sc->nfe_jumbo_disable = 1;
1674c1686,1689
< nfe_rxeof(sc, count);
---
> if (sc->nfe_framesize > MCLBYTES - ETHER_HDR_LEN)
> nfe_jrxeof(sc, count);
> else
> nfe_rxeof(sc, count);
1749c1764,1765
< if ((sc->nfe_flags & NFE_JUMBO_SUP) == 0 &&
---
> if ((((sc->nfe_flags & NFE_JUMBO_SUP) == 0) ||
> (sc->nfe_jumbo_disable != 0)) &&