Deleted Added
full compact
if_mxge.c (247268) if_mxge.c (249586)
1/******************************************************************************
2
3Copyright (c) 2006-2013, Myricom Inc.
4All rights reserved.
5
6Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met:
8

--- 14 unchanged lines hidden (view full) ---

23INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26POSSIBILITY OF SUCH DAMAGE.
27
28***************************************************************************/
29
30#include <sys/cdefs.h>
1/******************************************************************************
2
3Copyright (c) 2006-2013, Myricom Inc.
4All rights reserved.
5
6Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met:
8

--- 14 unchanged lines hidden (view full) ---

23INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26POSSIBILITY OF SUCH DAMAGE.
27
28***************************************************************************/
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/sys/dev/mxge/if_mxge.c 247268 2013-02-25 16:22:40Z gallatin $");
31__FBSDID("$FreeBSD: head/sys/dev/mxge/if_mxge.c 249586 2013-04-17 11:47:32Z gabor $");
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/linker.h>
36#include <sys/firmware.h>
37#include <sys/endian.h>
38#include <sys/sockio.h>
39#include <sys/mbuf.h>

--- 3373 unchanged lines hidden (view full) ---

3413 err = bus_dmamap_create(ss->rx_big.dmat, 0,
3414 &ss->rx_big.extra_map);
3415 if (err != 0) {
3416 device_printf(sc->dev, "Err %d extra rx_big dmamap\n",
3417 err);
3418 return err;
3419 }
3420
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/linker.h>
36#include <sys/firmware.h>
37#include <sys/endian.h>
38#include <sys/sockio.h>
39#include <sys/mbuf.h>

--- 3373 unchanged lines hidden (view full) ---

3413 err = bus_dmamap_create(ss->rx_big.dmat, 0,
3414 &ss->rx_big.extra_map);
3415 if (err != 0) {
3416 device_printf(sc->dev, "Err %d extra rx_big dmamap\n",
3417 err);
3418 return err;
3419 }
3420
3421 /* now allocate TX resouces */
3421 /* now allocate TX resources */
3422
3423#ifndef IFNET_BUF_RING
3424 /* only use a single TX ring for now */
3425 if (ss != ss->sc->ss)
3426 return 0;
3427#endif
3428
3429 ss->tx.mask = tx_ring_entries - 1;

--- 1606 unchanged lines hidden ---
3422
3423#ifndef IFNET_BUF_RING
3424 /* only use a single TX ring for now */
3425 if (ss != ss->sc->ss)
3426 return 0;
3427#endif
3428
3429 ss->tx.mask = tx_ring_entries - 1;

--- 1606 unchanged lines hidden ---