summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornp <np@FreeBSD.org>2013-01-17 18:52:49 +0000
committernp <np@FreeBSD.org>2013-01-17 18:52:49 +0000
commit5bfac01b59eed334999aba307301bc24c8139bda (patch)
tree298c3f4b0eba7ff79fdb019a951cb87fb3a43d14
parent7cc7eee4d9d375e697381802e81c465ed5b75891 (diff)
downloadFreeBSD-src-5bfac01b59eed334999aba307301bc24c8139bda.zip
FreeBSD-src-5bfac01b59eed334999aba307301bc24c8139bda.tar.gz
cxgbe: Make the for_each macros safer to use by turning them
into a single statement each. Submitted by: Christoph Mallon <christoph dot mallon at gmx dot de> MFC after: 1 week
-rw-r--r--sys/dev/cxgbe/adapter.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
index a27fe48..219bab4 100644
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -648,17 +648,17 @@ struct adapter {
#define TXQ_LOCK_ASSERT_NOTOWNED(txq) EQ_LOCK_ASSERT_NOTOWNED(&(txq)->eq)
#define for_each_txq(pi, iter, q) \
- q = &pi->adapter->sge.txq[pi->first_txq]; \
- for (iter = 0; iter < pi->ntxq; ++iter, ++q)
+ for (q = &pi->adapter->sge.txq[pi->first_txq], iter = 0; \
+ iter < pi->ntxq; ++iter, ++q)
#define for_each_rxq(pi, iter, q) \
- q = &pi->adapter->sge.rxq[pi->first_rxq]; \
- for (iter = 0; iter < pi->nrxq; ++iter, ++q)
+ for (q = &pi->adapter->sge.rxq[pi->first_rxq], iter = 0; \
+ iter < pi->nrxq; ++iter, ++q)
#define for_each_ofld_txq(pi, iter, q) \
- q = &pi->adapter->sge.ofld_txq[pi->first_ofld_txq]; \
- for (iter = 0; iter < pi->nofldtxq; ++iter, ++q)
+ for (q = &pi->adapter->sge.ofld_txq[pi->first_ofld_txq], iter = 0; \
+ iter < pi->nofldtxq; ++iter, ++q)
#define for_each_ofld_rxq(pi, iter, q) \
- q = &pi->adapter->sge.ofld_rxq[pi->first_ofld_rxq]; \
- for (iter = 0; iter < pi->nofldrxq; ++iter, ++q)
+ for (q = &pi->adapter->sge.ofld_rxq[pi->first_ofld_rxq], iter = 0; \
+ iter < pi->nofldrxq; ++iter, ++q)
/* One for errors, one for firmware events */
#define T4_EXTRA_INTR 2
OpenPOWER on IntegriCloud