Deleted Added
full compact
if_re_netmap.h (270063) if_re_netmap.h (271849)
1/*
2 * Copyright (C) 2011-2014 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.

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

19 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
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/*
1/*
2 * Copyright (C) 2011-2014 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.

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

19 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
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 * $FreeBSD: head/sys/dev/netmap/if_re_netmap.h 270063 2014-08-16 15:00:01Z luigi $
27 * $FreeBSD: head/sys/dev/netmap/if_re_netmap.h 271849 2014-09-19 03:51:26Z glebius $
28 *
29 * netmap support for: re
30 *
31 * For more details on netmap support please see ixgbe_netmap.h
32 */
33
34
35#include <net/netmap.h>

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

217 total_len = rxstat & sc->rl_rxlenmask;
218 /* XXX subtract crc */
219 total_len = (total_len < 4) ? 0 : total_len - 4;
220 ring->slot[nm_i].len = total_len;
221 ring->slot[nm_i].flags = slot_flags;
222 /* sync was in re_newbuf() */
223 bus_dmamap_sync(sc->rl_ldata.rl_rx_mtag,
224 rxd[nic_i].rx_dmamap, BUS_DMASYNC_POSTREAD);
28 *
29 * netmap support for: re
30 *
31 * For more details on netmap support please see ixgbe_netmap.h
32 */
33
34
35#include <net/netmap.h>

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

217 total_len = rxstat & sc->rl_rxlenmask;
218 /* XXX subtract crc */
219 total_len = (total_len < 4) ? 0 : total_len - 4;
220 ring->slot[nm_i].len = total_len;
221 ring->slot[nm_i].flags = slot_flags;
222 /* sync was in re_newbuf() */
223 bus_dmamap_sync(sc->rl_ldata.rl_rx_mtag,
224 rxd[nic_i].rx_dmamap, BUS_DMASYNC_POSTREAD);
225 // sc->rl_ifp->if_ipackets++;
225 // if_inc_counter(sc->rl_ifp, IFCOUNTER_IPACKETS, 1);
226 nm_i = nm_next(nm_i, lim);
227 nic_i = nm_next(nic_i, lim);
228 }
229 sc->rl_ldata.rl_rx_prodidx = nic_i;
230 kring->nr_hwtail = nm_i;
231 kring->nr_kflags &= ~NKR_PENDINTR;
232 }
233

--- 146 unchanged lines hidden ---
226 nm_i = nm_next(nm_i, lim);
227 nic_i = nm_next(nic_i, lim);
228 }
229 sc->rl_ldata.rl_rx_prodidx = nic_i;
230 kring->nr_hwtail = nm_i;
231 kring->nr_kflags &= ~NKR_PENDINTR;
232 }
233

--- 146 unchanged lines hidden ---