summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorluigi <luigi@FreeBSD.org>2013-05-02 16:01:04 +0000
committerluigi <luigi@FreeBSD.org>2013-05-02 16:01:04 +0000
commit14aed713fd585a8ba64715e9c8d8b831ecbe2bd4 (patch)
tree184d2ee3df3f8f98b3a004d8c2ad13ab1eb692b5 /sys
parentbd30a3f41d060e0da36cce5c25467fe57ae77ac9 (diff)
downloadFreeBSD-src-14aed713fd585a8ba64715e9c8d8b831ecbe2bd4.zip
FreeBSD-src-14aed713fd585a8ba64715e9c8d8b831ecbe2bd4.tar.gz
remove trailing whitespace
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/netmap/if_em_netmap.h2
-rw-r--r--sys/dev/netmap/if_re_netmap.h6
-rw-r--r--sys/dev/netmap/netmap.c6
-rw-r--r--sys/dev/netmap/netmap_mem2.c8
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/netmap/if_em_netmap.h b/sys/dev/netmap/if_em_netmap.h
index 37127dd..5bfbd3d 100644
--- a/sys/dev/netmap/if_em_netmap.h
+++ b/sys/dev/netmap/if_em_netmap.h
@@ -276,7 +276,7 @@ em_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
k = ring->cur;
if (k > lim)
return netmap_ring_reinit(kring);
-
+
if (do_lock)
EM_RX_LOCK(rxr);
diff --git a/sys/dev/netmap/if_re_netmap.h b/sys/dev/netmap/if_re_netmap.h
index 1995d01..f0f1f19 100644
--- a/sys/dev/netmap/if_re_netmap.h
+++ b/sys/dev/netmap/if_re_netmap.h
@@ -150,7 +150,7 @@ re_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
/* update avail to what the kernel knows */
ring->avail = kring->nr_hwavail;
-
+
j = kring->nr_hwcur;
if (j != k) { /* we have new packets to send */
l = sc->rl_ldata.rl_tx_prodidx;
@@ -169,7 +169,7 @@ re_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
// XXX what about prodidx ?
return netmap_ring_reinit(kring);
}
-
+
if (l == lim) /* mark end of ring */
cmd |= RL_TDESC_CMD_EOR;
@@ -334,7 +334,7 @@ re_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
*/
static void
re_netmap_tx_init(struct rl_softc *sc)
-{
+{
struct rl_txdesc *txd;
struct rl_desc *desc;
int i, n;
diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c
index c9e00aa..b55c338 100644
--- a/sys/dev/netmap/netmap.c
+++ b/sys/dev/netmap/netmap.c
@@ -168,10 +168,10 @@ SYSCTL_INT(_dev_netmap, OID_AUTO, bridge, CTLFLAG_RW, &netmap_bridge, 0 , "");
#endif /* !linux */
-/*
+/*
* These are used to handle reference counters for bridge ports.
*/
-#define ADD_BDG_REF(ifp) refcount_acquire(&NA(ifp)->na_bdg_refcount)
+#define ADD_BDG_REF(ifp) refcount_acquire(&NA(ifp)->na_bdg_refcount)
#define DROP_BDG_REF(ifp) refcount_release(&NA(ifp)->na_bdg_refcount)
static void bdg_netmap_attach(struct ifnet *ifp);
@@ -313,7 +313,7 @@ netmap_update_config(struct netmap_adapter *na)
txd = na->num_tx_desc;
rxr = na->num_rx_rings;
rxd = na->num_rx_desc;
- }
+ }
if (na->num_tx_rings == txr && na->num_tx_desc == txd &&
na->num_rx_rings == rxr && na->num_rx_desc == rxd)
diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c
index 445d185..68bf8db 100644
--- a/sys/dev/netmap/netmap_mem2.c
+++ b/sys/dev/netmap/netmap_mem2.c
@@ -101,7 +101,7 @@
// #define NMA_LOCK_T safe_spinlock_t
#define NMA_LOCK_T struct semaphore
#define NMA_LOCK_INIT() sema_init(&nm_mem.nm_mtx, 1)
-#define NMA_LOCK_DESTROY()
+#define NMA_LOCK_DESTROY()
#define NMA_LOCK() down(&nm_mem.nm_mtx)
#define NMA_UNLOCK() up(&nm_mem.nm_mtx)
#else /* !linux */
@@ -527,12 +527,12 @@ netmap_config_obj_allocator(struct netmap_obj_pool *p, u_int objtotal, u_int obj
objsize += LINE_ROUND - i;
}
if (objsize < p->objminsize || objsize > p->objmaxsize) {
- D("requested objsize %d out of range [%d, %d]",
+ D("requested objsize %d out of range [%d, %d]",
objsize, p->objminsize, p->objmaxsize);
goto error;
}
if (objtotal < p->nummin || objtotal > p->nummax) {
- D("requested objtotal %d out of range [%d, %d]",
+ D("requested objtotal %d out of range [%d, %d]",
objtotal, p->nummin, p->nummax);
goto error;
}
@@ -693,7 +693,7 @@ netmap_memory_config(void)
/* reset previous allocation */
for (i = 0; i < NETMAP_POOLS_NR; i++) {
netmap_reset_obj_allocator(&nm_mem.pools[i]);
- }
+ }
nm_mem.finalized = 0;
}
OpenPOWER on IntegriCloud