Deleted Added
full compact
netmap_kern.h (272110) netmap_kern.h (274355)
1/*
2 * Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
3 * Copyright (C) 2013-2014 Universita` di Pisa. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

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

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27/*
28 * $FreeBSD: head/sys/dev/netmap/netmap_kern.h 272110 2014-09-25 15:57:57Z luigi $
28 * $FreeBSD: head/sys/dev/netmap/netmap_kern.h 274355 2014-11-10 21:00:23Z 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_
36

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

261
262
263 NM_SELINFO_T si; /* poll/select wait queue */
264 NM_LOCK_T q_lock; /* protects kring and ring. */
265 NM_ATOMIC_T nr_busy; /* prevent concurrent syscalls */
266
267 struct netmap_adapter *na;
268
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_
36

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

261
262
263 NM_SELINFO_T si; /* poll/select wait queue */
264 NM_LOCK_T q_lock; /* protects kring and ring. */
265 NM_ATOMIC_T nr_busy; /* prevent concurrent syscalls */
266
267 struct netmap_adapter *na;
268
269 /* The folloiwing fields are for VALE switch support */
269 /* The following fields are for VALE switch support */
270 struct nm_bdg_fwd *nkr_ft;
271 uint32_t *nkr_leases;
272#define NR_NOSLOT ((uint32_t)~0) /* used in nkr_*lease* */
273 uint32_t nkr_hwlease;
274 uint32_t nkr_lease_idx;
275
276 /* while nkr_stopped is set, no new [tr]xsync operations can
277 * be started on this kring.

--- 1347 unchanged lines hidden ---
270 struct nm_bdg_fwd *nkr_ft;
271 uint32_t *nkr_leases;
272#define NR_NOSLOT ((uint32_t)~0) /* used in nkr_*lease* */
273 uint32_t nkr_hwlease;
274 uint32_t nkr_lease_idx;
275
276 /* while nkr_stopped is set, no new [tr]xsync operations can
277 * be started on this kring.

--- 1347 unchanged lines hidden ---