From cfa866f6a1ba4798cd6d877f0f0e4f45227efb9c Mon Sep 17 00:00:00 2001 From: Matt Macy Date: Fri, 18 May 2018 03:38:17 +0000 Subject: netmap: pull fix for 32-bit support from upstream Approved by: sbruno --- sys/dev/netmap/netmap_generic.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'sys/dev/netmap/netmap_generic.c') diff --git a/sys/dev/netmap/netmap_generic.c b/sys/dev/netmap/netmap_generic.c index 24d36d5db1b3..a8da6cea06b0 100644 --- a/sys/dev/netmap/netmap_generic.c +++ b/sys/dev/netmap/netmap_generic.c @@ -235,14 +235,14 @@ nm_os_get_mbuf(struct ifnet *ifp, int len) for ((_k)=*(_karr), (_i) = 0; (_i) < (_n); (_i)++, (_k) = (_karr)[(_i)]) #define for_each_tx_kring(_i, _k, _na) \ - for_each_kring_n(_i, _k, (_na)->tx_rings, (_na)->num_tx_rings) + for_each_kring_n(_i, _k, (_na)->tx_rings, (_na)->num_tx_rings) #define for_each_tx_kring_h(_i, _k, _na) \ - for_each_kring_n(_i, _k, (_na)->tx_rings, (_na)->num_tx_rings + 1) + for_each_kring_n(_i, _k, (_na)->tx_rings, (_na)->num_tx_rings + 1) #define for_each_rx_kring(_i, _k, _na) \ - for_each_kring_n(_i, _k, (_na)->rx_rings, (_na)->num_rx_rings) + for_each_kring_n(_i, _k, (_na)->rx_rings, (_na)->num_rx_rings) #define for_each_rx_kring_h(_i, _k, _na) \ - for_each_kring_n(_i, _k, (_na)->rx_rings, (_na)->num_rx_rings + 1) + for_each_kring_n(_i, _k, (_na)->rx_rings, (_na)->num_rx_rings + 1) /* ======================== PERFORMANCE STATISTICS =========================== */ @@ -297,12 +297,12 @@ static struct rate_context rate_ctx; void generic_rate(int txp, int txs, int txi, int rxp, int rxs, int rxi) { - if (txp) rate_ctx.new.txpkt++; - if (txs) rate_ctx.new.txsync++; - if (txi) rate_ctx.new.txirq++; - if (rxp) rate_ctx.new.rxpkt++; - if (rxs) rate_ctx.new.rxsync++; - if (rxi) rate_ctx.new.rxirq++; + if (txp) rate_ctx.new.txpkt++; + if (txs) rate_ctx.new.txsync++; + if (txi) rate_ctx.new.txirq++; + if (rxp) rate_ctx.new.rxpkt++; + if (rxs) rate_ctx.new.rxsync++; + if (rxi) rate_ctx.new.rxirq++; } #else /* !RATE */ @@ -586,7 +586,7 @@ generic_mbuf_destructor(struct mbuf *m) * MBUF_TXQ(m) under our feet. If the match is not found * on 'r', we try to see if it belongs to some other ring. */ - for (;;) { + for (;;) { bool match = false; kring = na->tx_rings[r]; -- cgit v1.3