From 23f8872b48ade950a85bc02410741ced07ffbe7d Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Thu, 3 Jan 2013 12:29:07 +0800 Subject: [PATCH] de: Don't use IF_ macros on ifnet.if_snd --- sys/dev/netif/de/if_de.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c index b7ca4e7d5f..47f14a7892 100644 --- a/sys/dev/netif/de/if_de.c +++ b/sys/dev/netif/de/if_de.c @@ -3795,17 +3795,15 @@ tulip_ifstart(struct ifnet *ifp) if ((sc->tulip_flags & (TULIP_WANTSETUP|TULIP_TXPROBE_ACTIVE)) == TULIP_WANTSETUP) tulip_txput_setup(sc); - while (sc->tulip_if.if_snd.ifq_head != NULL) { + while (!ifq_is_empty(&sc->tulip_if.if_snd)) { struct mbuf *m; - ALTQ_LOCK(&sc->tulip_if.if_snd); - IF_DEQUEUE(&sc->tulip_if.if_snd, m); - ALTQ_UNLOCK(&sc->tulip_if.if_snd); + m = ifq_dequeue(&sc->tulip_if.if_snd, NULL); + if (m == NULL) + break; if ((m = tulip_txput(sc, m)) != NULL) { - ALTQ_LOCK(&sc->tulip_if.if_snd); - IF_PREPEND(&sc->tulip_if.if_snd, m); - ALTQ_UNLOCK(&sc->tulip_if.if_snd); + ifq_prepend(&sc->tulip_if.if_snd, m); break; } } -- 2.41.0