From 2d6b4a73baf9778174648d6c68bb2385a4a7d948 Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Thu, 3 Jan 2013 11:52:31 +0800 Subject: [PATCH] ral: Don't use IF_ macros on ifnet.if_snd --- sys/dev/netif/ral/rt2560.c | 4 ++-- sys/dev/netif/ral/rt2661.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/netif/ral/rt2560.c b/sys/dev/netif/ral/rt2560.c index 8136f5d322..b027d993d8 100644 --- a/sys/dev/netif/ral/rt2560.c +++ b/sys/dev/netif/ral/rt2560.c @@ -1916,11 +1916,11 @@ rt2560_start_locked(struct ifnet *ifp) struct ieee80211_node *ni; for (;;) { - IF_DEQUEUE(&ifp->if_snd, m); + m = ifq_dequeue(&ifp->if_snd, NULL); if (m == NULL) break; if (sc->txq.queued >= RT2560_TX_RING_COUNT - 1) { - IF_PREPEND(&ifp->if_snd, m); + ifq_prepend(&ifp->if_snd, m); ifq_set_oactive(&ifp->if_snd); sc->sc_flags |= RT2560_F_DATA_OACTIVE; break; diff --git a/sys/dev/netif/ral/rt2661.c b/sys/dev/netif/ral/rt2661.c index 605a48e792..cf7ac86495 100644 --- a/sys/dev/netif/ral/rt2661.c +++ b/sys/dev/netif/ral/rt2661.c @@ -1619,14 +1619,14 @@ rt2661_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 >= RT2661_TX_RING_COUNT - 1) { /* there is no place left in this ring */ - IF_PREPEND(&ifp->if_snd, m); + ifq_prepend(&ifp->if_snd, m); ifq_set_oactive(&ifp->if_snd); break; } -- 2.41.0