From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Thu, 3 Jan 2013 03:50:49 +0000 (+0800)
Subject: iwi: Dont' use IF_ macros on ifnet.if_snd
X-Git-Tag: v3.4.0rc~574
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/1d342e2d204127d21046d9ada3c2c216dd4922c6

iwi: Dont' use IF_ macros on ifnet.if_snd
---

diff --git a/sys/dev/netif/iwi/if_iwi.c b/sys/dev/netif/iwi/if_iwi.c
index f351b91e96..1f48e0b96a 100644
--- a/sys/dev/netif/iwi/if_iwi.c
+++ b/sys/dev/netif/iwi/if_iwi.c
@@ -1935,14 +1935,14 @@ iwi_start_locked(struct ifnet *ifp)
 		return;
 
 	for (;;) {
-		IF_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd, NULL);
 		if (m == NULL)
 			break;
 		ac = M_WME_GETAC(m);
 		if (sc->txq[ac].queued > IWI_TX_RING_COUNT - 8) {
 			/* there is no place left in this ring; tail drop */
 			/* XXX tail drop */
-			IF_PREPEND(&ifp->if_snd, m);
+			ifq_prepend(&ifp->if_snd, m);
 			ifq_set_oactive(&ifp->if_snd);
 			break;
 		}