Index: sys/dev/oce/oce_if.h
===================================================================
--- sys/dev/oce/oce_if.h
+++ sys/dev/oce/oce_if.h
@@ -212,17 +212,17 @@
 #define BSWAP_64(x)			((BSWAP_32(x) << 32) | \
 					BSWAP_32((x) >> 32))
 
-#define for_all_wq_queues(sc, wq, i) 	\
-		for (i = 0, wq = sc->wq[0]; i < sc->nwqs; i++, wq = sc->wq[i])
-#define for_all_rq_queues(sc, rq, i) 	\
-		for (i = 0, rq = sc->rq[0]; i < sc->nrqs; i++, rq = sc->rq[i])
-#define for_all_rss_queues(sc, rq, i) 	\
-		for (i = 0, rq = sc->rq[i + 1]; i < (sc->nrqs - 1); \
-		     i++, rq = sc->rq[i + 1])
-#define for_all_evnt_queues(sc, eq, i) 	\
-		for (i = 0, eq = sc->eq[0]; i < sc->neqs; i++, eq = sc->eq[i])
-#define for_all_cq_queues(sc, cq, i) 	\
-		for (i = 0, cq = sc->cq[0]; i < sc->ncqs; i++, cq = sc->cq[i])
+#define for_all_wq_queues(sc, wq_, i) 	\
+		for (i = 0, wq_ = sc->wq[0]; i < sc->nwqs; i++, wq_ = sc->wq[i])
+#define for_all_rq_queues(sc, rq_, i) 	\
+		for (i = 0, rq_ = sc->rq[0]; i < sc->nrqs; i++, rq_ = sc->rq[i])
+#define for_all_rss_queues(sc, rq_, i) 	\
+		for (i = 0, rq_ = sc->rq[i + 1]; i < (sc->nrqs - 1); \
+		     i++, rq_ = sc->rq[i + 1])
+#define for_all_evnt_queues(sc, eq_, i) 	\
+		for (i = 0, eq_ = sc->eq[0]; i < sc->neqs; i++, eq_ = sc->eq[i])
+#define for_all_cq_queues(sc, cq_, i) 	\
+		for (i = 0, cq_ = sc->cq[0]; i < sc->ncqs; i++, cq_ = sc->cq[i])
 
 
 /* Flash specific */