diff options
Diffstat (limited to 'sys/dev/netmap/netmap_pipe.c')
| -rw-r--r-- | sys/dev/netmap/netmap_pipe.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/dev/netmap/netmap_pipe.c b/sys/dev/netmap/netmap_pipe.c index 80843403b996a..48dde5382f77a 100644 --- a/sys/dev/netmap/netmap_pipe.c +++ b/sys/dev/netmap/netmap_pipe.c @@ -81,7 +81,8 @@ static int netmap_default_pipes = 0; /* ignored, kept for compatibility */ SYSBEGIN(vars_pipes); SYSCTL_DECL(_dev_netmap); -SYSCTL_INT(_dev_netmap, OID_AUTO, default_pipes, CTLFLAG_RW, &netmap_default_pipes, 0 , ""); +SYSCTL_INT(_dev_netmap, OID_AUTO, default_pipes, CTLFLAG_RW, + &netmap_default_pipes, 0, "For compatibility only"); SYSEND; /* allocate the pipe array in the parent adapter */ @@ -182,6 +183,7 @@ netmap_pipe_txsync(struct netmap_kring *txkring, int flags) u_int j, k, lim_tx = txkring->nkr_num_slots - 1, lim_rx = rxkring->nkr_num_slots - 1; int m, busy; + struct netmap_ring *txring = txkring->ring, *rxring = rxkring->ring; ND("%p: %s %x -> %s", txkring, txkring->name, flags, rxkring->name); ND(2, "before: hwcur %d hwtail %d cur %d head %d tail %d", txkring->nr_hwcur, txkring->nr_hwtail, @@ -208,18 +210,18 @@ netmap_pipe_txsync(struct netmap_kring *txkring, int flags) } while (limit-- > 0) { - struct netmap_slot *rs = &rxkring->ring->slot[j]; - struct netmap_slot *ts = &txkring->ring->slot[k]; + struct netmap_slot *rs = &rxring->slot[j]; + struct netmap_slot *ts = &txring->slot[k]; struct netmap_slot tmp; - /* swap the slots */ + __builtin_prefetch(ts + 1); + + /* swap the slots and report the buffer change */ tmp = *rs; + tmp.flags |= NS_BUF_CHANGED; *rs = *ts; - *ts = tmp; - - /* report the buffer change */ - ts->flags |= NS_BUF_CHANGED; rs->flags |= NS_BUF_CHANGED; + *ts = tmp; j = nm_next(j, lim_rx); k = nm_next(k, lim_tx); |