Deleted Added
full compact
netmap_vale.c (261909) netmap_vale.c (267128)
1/*
2 * Copyright (C) 2013-2014 Universita` di Pisa. 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.

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

52/*
53 * OS-specific code that is used only within this file.
54 * Other OS-specific code that must be accessed by drivers
55 * is present in netmap_kern.h
56 */
57
58#if defined(__FreeBSD__)
59#include <sys/cdefs.h> /* prerequisite */
1/*
2 * Copyright (C) 2013-2014 Universita` di Pisa. 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.

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

52/*
53 * OS-specific code that is used only within this file.
54 * Other OS-specific code that must be accessed by drivers
55 * is present in netmap_kern.h
56 */
57
58#if defined(__FreeBSD__)
59#include <sys/cdefs.h> /* prerequisite */
60__FBSDID("$FreeBSD: head/sys/dev/netmap/netmap_vale.c 261909 2014-02-15 04:53:04Z luigi $");
60__FBSDID("$FreeBSD: head/sys/dev/netmap/netmap_vale.c 267128 2014-06-05 21:12:41Z luigi $");
61
62#include <sys/types.h>
63#include <sys/errno.h>
64#include <sys/param.h> /* defines used in kernel.h */
65#include <sys/kernel.h> /* types used in module initialization */
66#include <sys/conf.h> /* cdevsw struct, UID, GID */
67#include <sys/sockio.h>
68#include <sys/socketvar.h> /* struct socket */

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

1778
1779 ring->head = kring->rhead;
1780 ring->cur = kring->rcur;
1781 ring->tail = kring->rtail;
1782
1783 if (is_host_ring) {
1784 vpna = hostna;
1785 ring_nr = 0;
61
62#include <sys/types.h>
63#include <sys/errno.h>
64#include <sys/param.h> /* defines used in kernel.h */
65#include <sys/kernel.h> /* types used in module initialization */
66#include <sys/conf.h> /* cdevsw struct, UID, GID */
67#include <sys/sockio.h>
68#include <sys/socketvar.h> /* struct socket */

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

1778
1779 ring->head = kring->rhead;
1780 ring->cur = kring->rcur;
1781 ring->tail = kring->rtail;
1782
1783 if (is_host_ring) {
1784 vpna = hostna;
1785 ring_nr = 0;
1786 }
1786 }
1787 /* simulate a user wakeup on the rx ring */
1788 /* fetch packets that have arrived.
1789 * XXX maybe do this in a loop ?
1790 */
1791 error = kring->nm_sync(kring, 0);
1792 if (error)
1793 goto put_out;
1794 if (kring->nr_hwcur == kring->nr_hwtail && netmap_verbose) {

--- 309 unchanged lines hidden ---
1787 /* simulate a user wakeup on the rx ring */
1788 /* fetch packets that have arrived.
1789 * XXX maybe do this in a loop ?
1790 */
1791 error = kring->nm_sync(kring, 0);
1792 if (error)
1793 goto put_out;
1794 if (kring->nr_hwcur == kring->nr_hwtail && netmap_verbose) {

--- 309 unchanged lines hidden ---