1
0
mirror of https://git.FreeBSD.org/src.git synced 2025-02-01 17:00:36 +00:00

whitespace changes:

remove $Id$ lines, and add blank lines around some #if / #elif /#endif
This commit is contained in:
Luigi Rizzo 2013-04-29 18:00:53 +00:00
parent 28cb773df8
commit d4b42e0869
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=250052
8 changed files with 11 additions and 9 deletions

View File

@ -25,7 +25,6 @@
/*
* $FreeBSD$
* $Id: if_em_netmap.h 10627 2012-02-23 19:37:15Z luigi $
*
* netmap support for em.
*

View File

@ -25,7 +25,6 @@
/*
* $FreeBSD$
* $Id: if_igb_netmap.h 10627 2012-02-23 19:37:15Z luigi $
*
* Netmap support for igb, partly contributed by Ahmed Kooli
* For details on netmap support please see ixgbe_netmap.h

View File

@ -26,7 +26,6 @@
/*
* $FreeBSD$
* $Id: if_lem_netmap.h 10627 2012-02-23 19:37:15Z luigi $
*
* netmap support for "lem"
*

View File

@ -25,7 +25,6 @@
/*
* $FreeBSD$
* $Id: if_re_netmap.h 10609 2012-02-22 19:44:58Z luigi $
*
* netmap support for "re"
* For details on netmap support please see ixgbe_netmap.h

View File

@ -25,7 +25,6 @@
/*
* $FreeBSD$
* $Id: ixgbe_netmap.h 10627 2012-02-23 19:37:15Z luigi $
*
* netmap modifications for ixgbe
*

View File

@ -99,6 +99,7 @@ MALLOC_DEFINE(M_NETMAP, "netmap", "Network memory map");
#include <net/netmap.h>
#include <dev/netmap/netmap_kern.h>
/* XXX the following variables must be deprecated and included in nm_mem */
u_int netmap_total_buffers;
u_int netmap_buf_size;
char *netmap_buffer_base; /* address of an invalid buffer */
@ -148,6 +149,8 @@ SYSCTL_INT(_dev_netmap, OID_AUTO, copy, CTLFLAG_RW, &netmap_copy, 0 , "");
#define NM_BDG_HASH 1024 /* forwarding table entries */
#define NM_BDG_BATCH 1024 /* entries in the forwarding buffer */
#define NM_BRIDGES 4 /* number of bridges */
int netmap_bridge = NM_BDG_BATCH; /* bridge batch size */
SYSCTL_INT(_dev_netmap, OID_AUTO, bridge, CTLFLAG_RW, &netmap_bridge, 0 , "");

View File

@ -25,7 +25,6 @@
/*
* $FreeBSD$
* $Id: netmap_kern.h 11829 2012-09-26 04:06:34Z luigi $
*
* The header contains the definitions of constants and function
* prototypes used only in kernelspace.
@ -35,6 +34,7 @@
#define _NET_NETMAP_KERN_H_
#if defined(__FreeBSD__)
#define likely(x) __builtin_expect(!!(x), 1)
#define unlikely(x) __builtin_expect(!!(x), 0)
@ -42,8 +42,10 @@
#define NM_SELINFO_T struct selinfo
#define MBUF_LEN(m) ((m)->m_pkthdr.len)
#define NM_SEND_UP(ifp, m) ((ifp)->if_input)(ifp, m)
#elif defined (linux)
#define NM_LOCK_T safe_spinlock_t // see bsd_glue.h
#define NM_LOCK_T safe_spinlock_t // see bsd_glue.h
#define NM_SELINFO_T wait_queue_head_t
#define MBUF_LEN(m) ((m)->len)
#define NM_SEND_UP(ifp, m) netif_rx(m)
@ -65,6 +67,7 @@
#endif
#elif defined (__APPLE__)
#warning apple support is incomplete.
#define likely(x) __builtin_expect(!!(x), 1)
#define unlikely(x) __builtin_expect(!!(x), 0)
@ -74,8 +77,10 @@
#define NM_SEND_UP(ifp, m) ((ifp)->if_input)(ifp, m)
#else
#error unsupported platform
#endif
#endif /* end - platform-specific code */
#define ND(format, ...)
#define D(format, ...) \

View File

@ -25,7 +25,6 @@
/*
* $FreeBSD$
* $Id: netmap_mem2.c 11881 2012-10-18 23:24:15Z luigi $
*
* (New) memory allocator for netmap
*/