Author: luigi
Date: Thu Jun 5 21:12:41 2014
New Revision: 267128
URL: http://svnweb.freebsd.org/changeset/base/267128
Log:
whitespace change: remove trailing whitespace
Modified:
head/sys/dev/netmap/netmap.c
head/sys/dev/netmap/netmap_kern.h
head/sys/dev/netmap/netmap_mem2.c
head/sys/dev/netmap/netmap_pipe.c
head/sys/dev/netmap/netmap_vale.c
head/sys/net/netmap.h
head/sys/net/netmap_user.h
Modified: head/sys/dev/netmap/netmap.c
==============================================================================
--- head/sys/dev/netmap/netmap.c Thu Jun 5 20:27:16 2014
(r267127)
+++ head/sys/dev/netmap/netmap.c Thu Jun 5 21:12:41 2014
(r267128)
@@ -1019,7 +1019,7 @@ netmap_rxsync_from_host(struct netmap_ad
nm_i = kring->nr_hwtail;
stop_i = nm_prev(nm_i, lim);
- while ( nm_i != stop_i && (m = mbq_dequeue(q)) != NULL ) {
+ while ( nm_i != stop_i && (m = mbq_dequeue(q)) != NULL ) {
int len = MBUF_LEN(m);
struct netmap_slot *slot = &ring->slot[nm_i];
@@ -1515,7 +1515,7 @@ netmap_set_ringid(struct netmap_priv_d *
if (nm_rx_si_user(priv))
na->rx_si_users++;
if (netmap_verbose) {
- D("%s: tx [%d,%d) rx [%d,%d) id %d",
+ D("%s: tx [%d,%d) rx [%d,%d) id %d",
NM_IFPNAME(na->ifp),
priv->np_txqfirst,
priv->np_txqlast,
@@ -2120,7 +2120,7 @@ do_retry_rx:
* Transparent mode: marked bufs on rx rings between
* kring->nr_hwcur and ring->head
* are passed to the other endpoint.
- *
+ *
* In this mode we also scan the sw rxring, which in
* turn passes packets up.
*
Modified: head/sys/dev/netmap/netmap_kern.h
==============================================================================
--- head/sys/dev/netmap/netmap_kern.h Thu Jun 5 20:27:16 2014
(r267127)
+++ head/sys/dev/netmap/netmap_kern.h Thu Jun 5 21:12:41 2014
(r267128)
@@ -678,7 +678,7 @@ static inline uint32_t
nm_kr_rxspace(struct netmap_kring *k)
{
int space = k->nr_hwtail - k->nr_hwcur;
- if (space < 0)
+ if (space < 0)
space += k->nkr_num_slots;
ND("preserving %d rx slots %d -> %d", space, k->nr_hwcur, k->nr_hwtail);
@@ -827,7 +827,7 @@ nm_txsync_finalize(struct netmap_kring *
{
/* update ring tail to what the kernel knows */
kring->ring->tail = kring->rtail = kring->nr_hwtail;
-
+
/* note, head/rhead/hwcur might be behind cur/rcur
* if no carrier
*/
Modified: head/sys/dev/netmap/netmap_mem2.c
==============================================================================
--- head/sys/dev/netmap/netmap_mem2.c Thu Jun 5 20:27:16 2014
(r267127)
+++ head/sys/dev/netmap/netmap_mem2.c Thu Jun 5 21:12:41 2014
(r267128)
@@ -992,7 +992,7 @@ netmap_mem_private_new(const char *name,
if (p[NETMAP_RING_POOL].num < v)
p[NETMAP_RING_POOL].num = v;
/* for each pipe we only need the buffers for the 4 "real" rings.
- * On the other end, the pipe ring dimension may be different from
+ * On the other end, the pipe ring dimension may be different from
* the parent port ring dimension. As a compromise, we allocate twice
the
* space actually needed if the pipe rings were the same size as the
parent rings
*/
Modified: head/sys/dev/netmap/netmap_pipe.c
==============================================================================
--- head/sys/dev/netmap/netmap_pipe.c Thu Jun 5 20:27:16 2014
(r267127)
+++ head/sys/dev/netmap/netmap_pipe.c Thu Jun 5 21:12:41 2014
(r267128)
@@ -391,7 +391,7 @@ err:
/* netmap_pipe_reg.
*
* There are two cases on registration (onoff==1)
- *
+ *
* 1.a) state is
*
* usr1 --> e1 --> e2
@@ -403,7 +403,7 @@ err:
* usr1 --> e1 --> e2 <-- usr2
*
* and we are e2. Drop the ref e1 is holding.
- *
+ *
* There are two additional cases on unregister (onoff==0)
*
* 2.a) state is
@@ -462,14 +462,14 @@ netmap_pipe_reg(struct netmap_adapter *n
*
* 1) state is
*
- * usr1 --> e1 --> e2
+ * usr1 --> e1 --> e2
*
- * and we are e1 (e2 is not registered, so krings_delete cannot be
+ * and we are e1 (e2 is not registered, so krings_delete cannot be
* called on it);
*
* 2) state is
*
- * usr1 --> e1 e2 <-- usr2
+ * usr1 --> e1 e2 <-- usr2
*
* and we are either e1 or e2.
*
@@ -519,7 +519,7 @@ netmap_pipe_dtor(struct netmap_adapter *
pna->peer_ref = 0;
netmap_adapter_put(&pna->peer->up);
}
- if (pna->role == NR_REG_PIPE_MASTER)
+ if (pna->role == NR_REG_PIPE_MASTER)
netmap_pipe_remove(pna->parent, pna);
netmap_adapter_put(pna->parent);
free(na->ifp, M_DEVBUF);
@@ -587,7 +587,7 @@ netmap_get_pipe_na(struct nmreq *nmr, st
error = ENODEV;
goto put_out;
}
- /* we create both master and slave.
+ /* we create both master and slave.
* The endpoint we were asked for holds a reference to
* the other one.
*/
Modified: head/sys/dev/netmap/netmap_vale.c
==============================================================================
--- head/sys/dev/netmap/netmap_vale.c Thu Jun 5 20:27:16 2014
(r267127)
+++ head/sys/dev/netmap/netmap_vale.c Thu Jun 5 21:12:41 2014
(r267128)
@@ -1783,7 +1783,7 @@ netmap_bwrap_intr_notify(struct netmap_a
if (is_host_ring) {
vpna = hostna;
ring_nr = 0;
- }
+ }
/* simulate a user wakeup on the rx ring */
/* fetch packets that have arrived.
* XXX maybe do this in a loop ?
Modified: head/sys/net/netmap.h
==============================================================================
--- head/sys/net/netmap.h Thu Jun 5 20:27:16 2014 (r267127)
+++ head/sys/net/netmap.h Thu Jun 5 21:12:41 2014 (r267128)
@@ -447,7 +447,7 @@ struct netmap_if {
*
* nr_arg1, nr_arg2, nr_arg3 (in/out) command specific
*
- *
+ *
*
*/
@@ -467,7 +467,7 @@ struct netmap_if {
* *** INVALID 0xA000
* one pipe ring, slave 0xC000 ring index
* *** INVALID 0xE000
- *
+ *
*/
struct nmreq {
char nr_name[IFNAMSIZ];
Modified: head/sys/net/netmap_user.h
==============================================================================
--- head/sys/net/netmap_user.h Thu Jun 5 20:27:16 2014 (r267127)
+++ head/sys/net/netmap_user.h Thu Jun 5 21:12:41 2014 (r267128)
@@ -293,7 +293,7 @@ typedef void (*nm_cb_t)(u_char *, const
* if passed a netmap_desc with mem != NULL,
* use that memory instead of mmap.
*/
-
+
static struct nm_desc *nm_open(const char *ifname, const struct nmreq *req,
uint64_t flags, const struct nm_desc *arg);
@@ -531,7 +531,7 @@ nm_open(const char *ifname, const struct
}
}
#endif /* debugging */
-
+
d->cur_tx_ring = d->first_tx_ring;
d->cur_rx_ring = d->first_rx_ring;
return d;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
