Deleted Added
full compact
netmap_kern.h (238985) netmap_kern.h (239140)
1/*
2 * Copyright (C) 2011-2012 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.

--- 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-2012 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.

--- 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/netmap_kern.h 238985 2012-08-02 11:59:43Z luigi $
27 * $FreeBSD: head/sys/dev/netmap/netmap_kern.h 239140 2012-08-08 15:27:01Z emaste $
28 * $Id: netmap_kern.h 11343 2012-07-03 09:08:38Z luigi $
29 *
30 * The header contains the definitions of constants and function
31 * prototypes used only in kernelspace.
32 */
33
34#ifndef _NET_NETMAP_KERN_H_
35#define _NET_NETMAP_KERN_H_

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

139 * and especially avoid huge contention on the locks.
140 */
141 int na_single; /* threads attached to a single hw queue */
142 int na_multi; /* threads attached to multiple hw queues */
143
144 int separate_locks; /* set if the interface suports different
145 locks for rx, tx and core. */
146
28 * $Id: netmap_kern.h 11343 2012-07-03 09:08:38Z luigi $
29 *
30 * The header contains the definitions of constants and function
31 * prototypes used only in kernelspace.
32 */
33
34#ifndef _NET_NETMAP_KERN_H_
35#define _NET_NETMAP_KERN_H_

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

139 * and especially avoid huge contention on the locks.
140 */
141 int na_single; /* threads attached to a single hw queue */
142 int na_multi; /* threads attached to multiple hw queues */
143
144 int separate_locks; /* set if the interface suports different
145 locks for rx, tx and core. */
146
147 u_int num_rx_rings; /* number of tx/rx ring pairs */
148 u_int num_tx_rings; // if nonzero, overrides num_rx_rings
147 u_int num_rx_rings; /* number of adapter receive rings */
148 u_int num_tx_rings; /* number of adapter transmit rings */
149
150 u_int num_tx_desc; /* number of descriptor in each queue */
151 u_int num_rx_desc;
152 //u_int buff_size; // XXX deprecate, use NETMAP_BUF_SIZE
153
154 /* tx_rings and rx_rings are private but allocated
155 * as a contiguous chunk of memory. Each array has
156 * N+1 entries, for the adapter queues and for the host queue.

--- 262 unchanged lines hidden ---
149
150 u_int num_tx_desc; /* number of descriptor in each queue */
151 u_int num_rx_desc;
152 //u_int buff_size; // XXX deprecate, use NETMAP_BUF_SIZE
153
154 /* tx_rings and rx_rings are private but allocated
155 * as a contiguous chunk of memory. Each array has
156 * N+1 entries, for the adapter queues and for the host queue.

--- 262 unchanged lines hidden ---