Deleted Added
full compact
if_lem_netmap.h (270063) if_lem_netmap.h (271849)
1/*
2 * Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

20 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * SUCH DAMAGE.
24 */
25
26
27/*
1/*
2 * Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

20 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * SUCH DAMAGE.
24 */
25
26
27/*
28 * $FreeBSD: head/sys/dev/netmap/if_lem_netmap.h 270063 2014-08-16 15:00:01Z luigi $
28 * $FreeBSD: head/sys/dev/netmap/if_lem_netmap.h 271849 2014-09-19 03:51:26Z glebius $
29 *
30 * netmap support for: lem
31 *
32 * For details on netmap support please see ixgbe_netmap.h
33 */
34
35
36#include <net/netmap.h>

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

405 }
406#endif /* NIC_PARAVIRT */
407 ND("%d new packets at nic %d nm %d tail %d",
408 n,
409 adapter->next_rx_desc_to_check,
410 netmap_idx_n2k(kring, adapter->next_rx_desc_to_check),
411 kring->nr_hwtail);
412 adapter->next_rx_desc_to_check = nic_i;
29 *
30 * netmap support for: lem
31 *
32 * For details on netmap support please see ixgbe_netmap.h
33 */
34
35
36#include <net/netmap.h>

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

405 }
406#endif /* NIC_PARAVIRT */
407 ND("%d new packets at nic %d nm %d tail %d",
408 n,
409 adapter->next_rx_desc_to_check,
410 netmap_idx_n2k(kring, adapter->next_rx_desc_to_check),
411 kring->nr_hwtail);
412 adapter->next_rx_desc_to_check = nic_i;
413 // ifp->if_ipackets += n;
413 // if_inc_counter(ifp, IFCOUNTER_IPACKETS, n);
414 kring->nr_hwtail = nm_i;
415 }
416 kring->nr_kflags &= ~NKR_PENDINTR;
417 }
418
419 /*
420 * Second part: skip past packets that userspace has released.
421 */

--- 76 unchanged lines hidden ---
414 kring->nr_hwtail = nm_i;
415 }
416 kring->nr_kflags &= ~NKR_PENDINTR;
417 }
418
419 /*
420 * Second part: skip past packets that userspace has released.
421 */

--- 76 unchanged lines hidden ---