diff options
| author | Luigi Rizzo <luigi@FreeBSD.org> | 2016-10-18 15:41:57 +0000 |
|---|---|---|
| committer | Luigi Rizzo <luigi@FreeBSD.org> | 2016-10-18 15:41:57 +0000 |
| commit | 6ad42d71b2c2d6afb14e8328d8bb1ba5b00919f8 (patch) | |
| tree | 40d5236306217975147879f4f9cf7fbd2cb702c8 /sys/dev/netmap | |
| parent | fbb9e715c022b92ee8aff08cc77077cfa3bc23fe (diff) | |
Notes
Diffstat (limited to 'sys/dev/netmap')
| -rw-r--r-- | sys/dev/netmap/if_vtnet_netmap.h | 4 | ||||
| -rw-r--r-- | sys/dev/netmap/netmap_monitor.c | 10 | ||||
| -rw-r--r-- | sys/dev/netmap/netmap_pipe.c | 4 | ||||
| -rw-r--r-- | sys/dev/netmap/netmap_vale.c | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/netmap/if_vtnet_netmap.h b/sys/dev/netmap/if_vtnet_netmap.h index 791cee56bcee..4bed0e718dd4 100644 --- a/sys/dev/netmap/if_vtnet_netmap.h +++ b/sys/dev/netmap/if_vtnet_netmap.h @@ -127,7 +127,7 @@ vtnet_netmap_txsync(struct netmap_kring *kring, int flags) * First part: process new packets to send. */ rmb(); - + nm_i = kring->nr_hwcur; if (nm_i != head) { /* we have new packets to send */ struct sglist *sg = txq->vtntx_sg; @@ -182,7 +182,7 @@ vtnet_netmap_txsync(struct netmap_kring *kring, int flags) virtqueue_enable_intr(vq); // like postpone with 0 } - + /* Free used slots. We only consider our own used buffers, recognized * by the token we passed to virtqueue_add_outbuf. */ diff --git a/sys/dev/netmap/netmap_monitor.c b/sys/dev/netmap/netmap_monitor.c index 5b4f9cdf61c0..bf6e23f5546e 100644 --- a/sys/dev/netmap/netmap_monitor.c +++ b/sys/dev/netmap/netmap_monitor.c @@ -191,7 +191,7 @@ nm_monitor_alloc(struct netmap_kring *kring, u_int n) if (n <= kring->max_monitors) /* we already have more entries that requested */ return 0; - + len = sizeof(struct netmap_kring *) * n; #ifndef _WIN32 nm = realloc(kring->monitors, len, M_DEVBUF, M_NOWAIT | M_ZERO); @@ -301,7 +301,7 @@ netmap_monitor_del(struct netmap_kring *mkring, struct netmap_kring *kring) kring->nm_sync = kring->mon_sync; kring->mon_sync = NULL; if (kring->tx == NR_RX) { - ND("%s: restoring notify on %s: %p", + ND("%s: restoring notify on %s: %p", mkring->name, kring->name, kring->mon_notify); kring->nm_notify = kring->mon_notify; kring->mon_notify = NULL; @@ -406,7 +406,7 @@ netmap_monitor_reg_common(struct netmap_adapter *na, int onoff, int zmon) /* **************************************************************** - * functions specific for zero-copy monitors + * functions specific for zero-copy monitors **************************************************************** */ @@ -554,7 +554,7 @@ netmap_zmon_dtor(struct netmap_adapter *na) /* **************************************************************** - * functions specific for copy monitors + * functions specific for copy monitors **************************************************************** */ @@ -729,7 +729,7 @@ netmap_get_monitor_na(struct nmreq *nmr, struct netmap_adapter **na, int create) if ((nmr->nr_flags & (NR_MONITOR_TX | NR_MONITOR_RX)) == 0) { if (nmr->nr_flags & NR_ZCOPY_MON) { - /* the flag makes no sense unless you are + /* the flag makes no sense unless you are * creating a monitor */ return EINVAL; diff --git a/sys/dev/netmap/netmap_pipe.c b/sys/dev/netmap/netmap_pipe.c index f0f1b524300a..f00f73f8b9b2 100644 --- a/sys/dev/netmap/netmap_pipe.c +++ b/sys/dev/netmap/netmap_pipe.c @@ -92,7 +92,7 @@ nm_pipe_alloc(struct netmap_adapter *na, u_int npipes) if (npipes <= na->na_max_pipes) /* we already have more entries that requested */ return 0; - + if (npipes < na->na_next_pipe || npipes > NM_MAXPIPES) return EINVAL; @@ -402,7 +402,7 @@ netmap_pipe_reg(struct netmap_adapter *na, int onoff) } } } - + /* create all missing needed rings on the other end */ error = netmap_mem_rings_create(ona); if (error) diff --git a/sys/dev/netmap/netmap_vale.c b/sys/dev/netmap/netmap_vale.c index 2d2c807681d2..78c53409c0b3 100644 --- a/sys/dev/netmap/netmap_vale.c +++ b/sys/dev/netmap/netmap_vale.c @@ -906,7 +906,7 @@ nm_bdg_create_kthreads(struct nm_bdg_polling_state *bps) int affinity = bps->cpu_from + i; t->bps = bps; - t->qfirst = all ? bps->qfirst /* must be 0 */: affinity; + t->qfirst = all ? bps->qfirst /* must be 0 */: affinity; t->qlast = all ? bps->qlast : t->qfirst + 1; D("kthread %d a:%u qf:%u ql:%u", i, affinity, t->qfirst, t->qlast); @@ -2540,7 +2540,7 @@ netmap_bwrap_notify(struct netmap_kring *kring, int flags) struct netmap_kring *hw_kring; int error; - ND("%s: na %s hwna %s", + ND("%s: na %s hwna %s", (kring ? kring->name : "NULL!"), (na ? na->name : "NULL!"), (hwna ? hwna->name : "NULL!")); |
