kern/78681: if_re under 5.3 doesn't support altq

[Theo Schlossnagle]

>Number:         78681
>Category:       kern
>Synopsis:       if_re under 5.3 doesn't support altq
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 10 20:50:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Theo Schlossnagle
>Release:        5.3-RELEASE-p5
>Organization:
OmniTI
>Environment:
FreeBSD ecbuild-16 5.3-RELEASE-p5 FreeBSD 5.3-RELEASE-p5 #12: Tue Feb 15 18:55:18 UTC 2005     root at pacifier:/usr/obj/usr/src/sys/GATE  i386
>Description:
Altq required ethernet drivers to use different macros for dequeueing and enqueueing pakcets.  if_re should use those.
>How-To-Repeat:
on a box with "re" interfaces, attempt to use altq in any fashion.
>Fix:
--- /usr/src/sys/dev/re/if_re.c.old     Tue Feb  1 21:37:26 2005
+++ /usr/src/sys/dev/re/if_re.c Tue Feb  1 22:20:04 2005
@@ -1203,7 +1203,9 @@
                ifp->if_baudrate = 1000000000;
        else
                ifp->if_baudrate = 100000000;
-       ifp->if_snd.ifq_maxlen = RL_IFQ_MAXLEN;
+       IFQ_SET_MAXLEN(&ifp->if_snd, RL_IFQ_MAXLEN);
+       ifp->if_snd.ifq_drv_maxlen = RL_IFQ_MAXLEN;
+       IFQ_SET_READY(&ifp->if_snd);
        ifp->if_capenable = ifp->if_capabilities;
 
        callout_handle_init(&sc->rl_stat_ch);
@@ -1786,7 +1788,7 @@
        re_rxeof(sc);
        re_txeof(sc);
 
-       if (ifp->if_snd.ifq_head != NULL)
+       if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
                re_start_locked(ifp);
 
        if (cmd == POLL_AND_CHECK_STATUS) { /* also check status register */
@@ -1870,7 +1872,7 @@
                }
        }
 
-       if (ifp->if_snd.ifq_head != NULL)
+       if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
                re_start_locked(ifp);
 
 done_locked:
@@ -2007,7 +2009,7 @@
 {
        struct rl_softc         *sc;
        struct mbuf             *m_head = NULL;
-       int                     idx;
+       int                     idx, queued = 0;
 
        sc = ifp->if_softc;
 
@@ -2016,7 +2018,7 @@
        idx = sc->rl_ldata.rl_tx_prodidx;
 
        while (sc->rl_ldata.rl_tx_mbuf[idx] == NULL) {
-               IF_DEQUEUE(&ifp->if_snd, m_head);
+               IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head);
                if (m_head == NULL)
                        break;
 

        if (re_encap(sc, &m_head, &idx)) {
-            IF_PREPEND(&ifp->if_snd, m_head);
+            IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
            ifp->if_flags |= IFF_OACTIVE;
            break;
        }
@@ -2031,25 +2033,27 @@
                 * to him.
                 */
                BPF_MTAP(ifp, m_head);
+
+               queued++;
        }
 
        /* Flush the TX descriptors */
+       if (queued) {
+               bus_dmamap_sync(sc->rl_ldata.rl_tx_list_tag,
+                       sc->rl_ldata.rl_tx_list_map,
+                       BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
 
-       bus_dmamap_sync(sc->rl_ldata.rl_tx_list_tag,
-           sc->rl_ldata.rl_tx_list_map,
-           BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
-
-       sc->rl_ldata.rl_tx_prodidx = idx;
+               sc->rl_ldata.rl_tx_prodidx = idx;
 
        /*
         * RealTek put the TX poll request register in a different
         * location on the 8169 gigE chip. I don't know why.
         */
 
-       if (sc->rl_type == RL_8169)
-               CSR_WRITE_2(sc, RL_GTXSTART, RL_TXSTART_START);
-       else
-               CSR_WRITE_2(sc, RL_TXSTART, RL_TXSTART_START);
+               if (sc->rl_type == RL_8169)
+                       CSR_WRITE_2(sc, RL_GTXSTART, RL_TXSTART_START);
+               else
+                       CSR_WRITE_2(sc, RL_TXSTART, RL_TXSTART_START);
 
        /*
         * Use the countdown timer for interrupt moderation.
@@ -2059,12 +2063,13 @@
         * interrupt. Each time we write to the TIMERCNT register,
         * the timer count is reset to 0.
         */
-       CSR_WRITE_4(sc, RL_TIMERCNT, 1);
+               CSR_WRITE_4(sc, RL_TIMERCNT, 1);
 
        /*
         * Set a timeout in case the chip goes out to lunch.
         */
-       ifp->if_timer = 5;
+               ifp->if_timer = 5;
+       }
 }
 
 static void

>Release-Note:
>Audit-Trail:
>Unformatted: