Author: marius
Date: Tue Feb 12 22:33:17 2019
New Revision: 344064
URL: https://svnweb.freebsd.org/changeset/base/344064

Log:
  Fix the build with ALTQ after r344060.

Modified:
  head/sys/net/iflib.c

Modified: head/sys/net/iflib.c
==============================================================================
--- head/sys/net/iflib.c        Tue Feb 12 22:29:41 2019        (r344063)
+++ head/sys/net/iflib.c        Tue Feb 12 22:33:17 2019        (r344064)
@@ -3658,6 +3658,9 @@ _task_fn_tx(void *context)
 {
        iflib_txq_t txq = context;
        if_ctx_t ctx = txq->ift_ctx;
+#if defined(ALTQ) || defined(DEV_NETMAP)
+       if_t ifp = ctx->ifc_ifp;
+#endif
        int abdicate = ctx->ifc_sysctl_tx_abdicate;
 
 #ifdef IFLIB_DIAGNOSTICS
@@ -3666,11 +3669,11 @@ _task_fn_tx(void *context)
        if (!(if_getdrvflags(ctx->ifc_ifp) & IFF_DRV_RUNNING))
                return;
 #ifdef DEV_NETMAP
-       if (if_getcapenable(ctx->ifc_ifp) & IFCAP_NETMAP) {
+       if (if_getcapenable(ifp) & IFCAP_NETMAP) {
                bus_dmamap_sync(txq->ift_ifdi->idi_tag, txq->ift_ifdi->idi_map,
                    BUS_DMASYNC_POSTREAD);
                if (ctx->isc_txd_credits_update(ctx->ifc_softc, txq->ift_id, 
false))
-                       netmap_tx_irq(ctx->ifc_ifp, txq->ift_id);
+                       netmap_tx_irq(ifp, txq->ift_id);
                IFDI_TX_QUEUE_INTR_ENABLE(ctx, txq->ift_id);
                return;
        }
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to