Importing pfSense patch iface_iftx_altq_hybrid.diff

5 files changed, 78 insertions, 103 deletions

diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 20321d0..895b366 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -204,15 +204,15 @@ static int	em_detach(device_t);
 static int	em_shutdown(device_t);
 static int	em_suspend(device_t);
 static int	em_resume(device_t);
-#ifdef EM_MULTIQUEUE
+
 static int	em_mq_start(struct ifnet *, struct mbuf *);
 static int	em_mq_start_locked(struct ifnet *,
 		    struct tx_ring *, struct mbuf *);
 static void	em_qflush(struct ifnet *);
-#else
+
 static void	em_start(struct ifnet *);
 static void	em_start_locked(struct ifnet *, struct tx_ring *);
-#endif
+
 static int	em_ioctl(struct ifnet *, u_long, caddr_t);
 static void	em_init(void *);
 static void	em_init_locked(struct adapter *);
@@ -888,13 +888,13 @@ em_resume(device_t dev)
 	    (ifp->if_drv_flags & IFF_DRV_RUNNING) && adapter->link_active) {
 		for (int i = 0; i < adapter->num_queues; i++, txr++) {
 			EM_TX_LOCK(txr);
-#ifdef EM_MULTIQUEUE
+
 			if (!drbr_empty(ifp, txr->br))
 				em_mq_start_locked(ifp, txr, NULL);
-#else
+
 			if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 				em_start_locked(ifp, txr);
-#endif
+
 			EM_TX_UNLOCK(txr);
 		}
 	}
@@ -904,7 +904,7 @@ em_resume(device_t dev)
 }
 
 
-#ifdef EM_MULTIQUEUE
+
 /*********************************************************************
  *  Multiqueue Transmit routines 
  *
@@ -1003,7 +1003,7 @@ em_qflush(struct ifnet *ifp)
 	}
 	if_qflush(ifp);
 }
-#else  /* !EM_MULTIQUEUE */
+
 
 static void
 em_start_locked(struct ifnet *ifp, struct tx_ring *txr)
@@ -1066,7 +1066,7 @@ em_start(struct ifnet *ifp)
 	}
 	return;
 }
-#endif /* EM_MULTIQUEUE */
+
 
 /*********************************************************************
  *  Ioctl entry point
@@ -1460,13 +1460,13 @@ em_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
 
 	EM_TX_LOCK(txr);
 	em_txeof(txr);
-#ifdef EM_MULTIQUEUE
+
 	if (!drbr_empty(ifp, txr->br))
 		em_mq_start_locked(ifp, txr, NULL);
-#else
+
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 		em_start_locked(ifp, txr);
-#endif
+
 	EM_TX_UNLOCK(txr);
 
 	return (rx_done);
@@ -1534,13 +1534,13 @@ em_handle_que(void *context, int pending)
 		bool more = em_rxeof(rxr, adapter->rx_process_limit, NULL);
 		EM_TX_LOCK(txr);
 		em_txeof(txr);
-#ifdef EM_MULTIQUEUE
+
 		if (!drbr_empty(ifp, txr->br))
 			em_mq_start_locked(ifp, txr, NULL);
-#else
+
 		if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 			em_start_locked(ifp, txr);
-#endif
+
 		EM_TX_UNLOCK(txr);
 		if (more) {
 			taskqueue_enqueue(adapter->tq, &adapter->que_task);
@@ -1568,13 +1568,13 @@ em_msix_tx(void *arg)
 	++txr->tx_irq;
 	EM_TX_LOCK(txr);
 	em_txeof(txr);
-#ifdef EM_MULTIQUEUE
+
 	if (!drbr_empty(ifp, txr->br))
 		em_mq_start_locked(ifp, txr, NULL);
-#else
+
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 		em_start_locked(ifp, txr);
-#endif
+
 	/* Reenable this interrupt */
 	E1000_WRITE_REG(&adapter->hw, E1000_IMS, txr->ims);
 	EM_TX_UNLOCK(txr);
@@ -1653,13 +1653,13 @@ em_handle_tx(void *context, int pending)
 
 	EM_TX_LOCK(txr);
 	em_txeof(txr);
-#ifdef EM_MULTIQUEUE
+
 	if (!drbr_empty(ifp, txr->br))
 		em_mq_start_locked(ifp, txr, NULL);
-#else
+
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 		em_start_locked(ifp, txr);
-#endif
+
 	E1000_WRITE_REG(&adapter->hw, E1000_IMS, txr->ims);
 	EM_TX_UNLOCK(txr);
 }
@@ -1683,13 +1683,13 @@ em_handle_link(void *context, int pending)
 	if (adapter->link_active) {
 		for (int i = 0; i < adapter->num_queues; i++, txr++) {
 			EM_TX_LOCK(txr);
-#ifdef EM_MULTIQUEUE
+
 			if (!drbr_empty(ifp, txr->br))
 				em_mq_start_locked(ifp, txr, NULL);
-#else
+
 			if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 				em_start_locked(ifp, txr);
-#endif
+
 			EM_TX_UNLOCK(txr);
 		}
 	}
@@ -2990,16 +2990,16 @@ em_setup_interface(device_t dev, struct adapter *adapter)
 	ifp->if_softc = adapter;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = em_ioctl;
-#ifdef EM_MULTIQUEUE
+
 	/* Multiqueue stack interface */
 	ifp->if_transmit = em_mq_start;
 	ifp->if_qflush = em_qflush;
-#else
+
 	ifp->if_start = em_start;
 	IFQ_SET_MAXLEN(&ifp->if_snd, adapter->num_tx_desc - 1);
 	ifp->if_snd.ifq_drv_maxlen = adapter->num_tx_desc - 1;
 	IFQ_SET_READY(&ifp->if_snd);
-#endif	
+
 
 	ether_ifattach(ifp, adapter->hw.mac.addr);
 
diff --git a/sys/dev/e1000/if_igb.c b/sys/dev/e1000/if_igb.c
index 484cba1..671adcb 100644
--- a/sys/dev/e1000/if_igb.c
+++ b/sys/dev/e1000/if_igb.c
@@ -43,9 +43,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#ifndef IGB_LEGACY_TX
 #include <sys/buf_ring.h>
-#endif
 #include <sys/bus.h>
 #include <sys/endian.h>
 #include <sys/kernel.h>
@@ -189,15 +187,12 @@ static int	igb_detach(device_t);
 static int	igb_shutdown(device_t);
 static int	igb_suspend(device_t);
 static int	igb_resume(device_t);
-#ifndef IGB_LEGACY_TX
 static int	igb_mq_start(struct ifnet *, struct mbuf *);
 static int	igb_mq_start_locked(struct ifnet *, struct tx_ring *);
 static void	igb_qflush(struct ifnet *);
 static void	igb_deferred_mq_start(void *, int);
-#else
 static void	igb_start(struct ifnet *);
 static void	igb_start_locked(struct tx_ring *, struct ifnet *ifp);
-#endif
 static int	igb_ioctl(struct ifnet *, u_long, caddr_t);
 static void	igb_init(void *);
 static void	igb_init_locked(struct adapter *);
@@ -361,7 +356,6 @@ TUNABLE_INT("hw.igb.max_interrupt_rate", &igb_max_interrupt_rate);
 SYSCTL_INT(_hw_igb, OID_AUTO, max_interrupt_rate, CTLFLAG_RDTUN,
     &igb_max_interrupt_rate, 0, "Maximum interrupts per second");
 
-#ifndef IGB_LEGACY_TX
 /*
 ** Tuneable number of buffers in the buf-ring (drbr_xxx)
 */
@@ -369,7 +363,6 @@ static int igb_buf_ring_size = IGB_BR_SIZE;
 TUNABLE_INT("hw.igb.buf_ring_size", &igb_buf_ring_size);
 SYSCTL_INT(_hw_igb, OID_AUTO, buf_ring_size, CTLFLAG_RDTUN,
     &igb_buf_ring_size, 0, "Size of the bufring");
-#endif
 
 /*
 ** Header split causes the packet header to
@@ -865,15 +858,15 @@ igb_resume(device_t dev)
 	    (ifp->if_drv_flags & IFF_DRV_RUNNING) && adapter->link_active) {
 		for (int i = 0; i < adapter->num_queues; i++, txr++) {
 			IGB_TX_LOCK(txr);
-#ifndef IGB_LEGACY_TX
+
 			/* Process the stack queue only if not depleted */
 			if (((txr->queue_status & IGB_QUEUE_DEPLETED) == 0) &&
 			    !drbr_empty(ifp, txr->br))
 				igb_mq_start_locked(ifp, txr);
-#else
+
 			if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 				igb_start_locked(txr, ifp);
-#endif
+
 			IGB_TX_UNLOCK(txr);
 		}
 	}
@@ -883,7 +876,6 @@ igb_resume(device_t dev)
 }
 
 
-#ifdef IGB_LEGACY_TX
 
 /*********************************************************************
  *  Transmit entry point
@@ -961,7 +953,6 @@ igb_start(struct ifnet *ifp)
 	return;
 }
 
-#else /* ~IGB_LEGACY_TX */
 
 /*
 ** Multiqueue Transmit Entry:
@@ -1081,7 +1072,6 @@ igb_qflush(struct ifnet *ifp)
 	}
 	if_qflush(ifp);
 }
-#endif /* ~IGB_LEGACY_TX */
 
 /*********************************************************************
  *  Ioctl entry point
@@ -1415,15 +1405,15 @@ igb_handle_que(void *context, int pending)
 
 		IGB_TX_LOCK(txr);
 		igb_txeof(txr);
-#ifndef IGB_LEGACY_TX
+
 		/* Process the stack queue only if not depleted */
 		if (((txr->queue_status & IGB_QUEUE_DEPLETED) == 0) &&
 		    !drbr_empty(ifp, txr->br))
 			igb_mq_start_locked(ifp, txr);
-#else
+
 		if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 			igb_start_locked(txr, ifp);
-#endif
+
 		IGB_TX_UNLOCK(txr);
 		/* Do we need another? */
 		if (more) {
@@ -1466,15 +1456,15 @@ igb_handle_link_locked(struct adapter *adapter)
 	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) && adapter->link_active) {
 		for (int i = 0; i < adapter->num_queues; i++, txr++) {
 			IGB_TX_LOCK(txr);
-#ifndef IGB_LEGACY_TX
+
 			/* Process the stack queue only if not depleted */
 			if (((txr->queue_status & IGB_QUEUE_DEPLETED) == 0) &&
 			    !drbr_empty(ifp, txr->br))
 				igb_mq_start_locked(ifp, txr);
-#else
+
 			if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 				igb_start_locked(txr, ifp);
-#endif
+
 			IGB_TX_UNLOCK(txr);
 		}
 	}
@@ -1568,13 +1558,10 @@ igb_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
 		do {
 			more = igb_txeof(txr);
 		} while (loop-- && more);
-#ifndef IGB_LEGACY_TX
 		if (!drbr_empty(ifp, txr->br))
 			igb_mq_start_locked(ifp, txr);
-#else
 		if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 			igb_start_locked(txr, ifp);
-#endif
 		IGB_TX_UNLOCK(txr);
 	}
 
@@ -1607,15 +1594,12 @@ igb_msix_que(void *arg)
 
 	IGB_TX_LOCK(txr);
 	igb_txeof(txr);
-#ifndef IGB_LEGACY_TX
 	/* Process the stack queue only if not depleted */
 	if (((txr->queue_status & IGB_QUEUE_DEPLETED) == 0) &&
 	    !drbr_empty(ifp, txr->br))
 		igb_mq_start_locked(ifp, txr);
-#else
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 		igb_start_locked(txr, ifp);
-#endif
 	IGB_TX_UNLOCK(txr);
 
 	more_rx = igb_rxeof(que, adapter->rx_process_limit, NULL);
@@ -2380,9 +2364,7 @@ igb_allocate_legacy(struct adapter *adapter)
 {
 	device_t		dev = adapter->dev;
 	struct igb_queue	*que = adapter->queues;
-#ifndef IGB_LEGACY_TX
 	struct tx_ring		*txr = adapter->tx_rings;
-#endif
 	int			error, rid = 0;
 
 	/* Turn off all interrupts */
@@ -2401,9 +2383,7 @@ igb_allocate_legacy(struct adapter *adapter)
 		return (ENXIO);
 	}
 
-#ifndef IGB_LEGACY_TX
 	TASK_INIT(&txr->txq_task, 0, igb_deferred_mq_start, txr);
-#endif
 
 	/*
 	 * Try allocating a fast interrupt and the associated deferred
@@ -2485,10 +2465,8 @@ igb_allocate_msix(struct adapter *adapter)
 				i,igb_last_bind_cpu);
 			igb_last_bind_cpu = CPU_NEXT(igb_last_bind_cpu);
 		}
-#ifndef IGB_LEGACY_TX
 		TASK_INIT(&que->txr->txq_task, 0, igb_deferred_mq_start,
 		    que->txr);
-#endif
 		/* Make tasklet for deferred handling */
 		TASK_INIT(&que->que_task, 0, igb_handle_que, que);
 		que->tq = taskqueue_create("igb_que", M_NOWAIT,
@@ -2712,9 +2690,9 @@ igb_free_pci_resources(struct adapter *adapter)
 
 	for (int i = 0; i < adapter->num_queues; i++, que++) {
 		if (que->tq != NULL) {
-#ifndef IGB_LEGACY_TX
+
 			taskqueue_drain(que->tq, &que->txr->txq_task);
-#endif
+
 			taskqueue_drain(que->tq, &que->que_task);
 			taskqueue_free(que->tq);
 		}
@@ -3115,15 +3093,15 @@ igb_setup_interface(device_t dev, struct adapter *adapter)
 	ifp->if_softc = adapter;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = igb_ioctl;
-#ifndef IGB_LEGACY_TX
+
 	ifp->if_transmit = igb_mq_start;
 	ifp->if_qflush = igb_qflush;
-#else
+
 	ifp->if_start = igb_start;
 	IFQ_SET_MAXLEN(&ifp->if_snd, adapter->num_tx_desc - 1);
 	ifp->if_snd.ifq_drv_maxlen = adapter->num_tx_desc - 1;
 	IFQ_SET_READY(&ifp->if_snd);
-#endif
+
 
 	ether_ifattach(ifp, adapter->hw.mac.addr);
 
@@ -3360,11 +3338,11 @@ igb_allocate_queues(struct adapter *adapter)
 			error = ENOMEM;
 			goto err_tx_desc;
         	}
-#ifndef IGB_LEGACY_TX
+
 		/* Allocate a buf ring */
 		txr->br = buf_ring_alloc(igb_buf_ring_size, M_DEVBUF,
 		    M_WAITOK, &txr->tx_mtx);
-#endif
+
 	}
 
 	/*
@@ -3421,9 +3399,9 @@ err_tx_desc:
 		igb_dma_free(adapter, &txr->txdma);
 	free(adapter->rx_rings, M_DEVBUF);
 rx_fail:
-#ifndef IGB_LEGACY_TX
+
 	buf_ring_free(txr->br, M_DEVBUF);
-#endif
+
 	free(adapter->tx_rings, M_DEVBUF);
 tx_fail:
 	free(adapter->queues, M_DEVBUF);
@@ -3679,10 +3657,10 @@ igb_free_transmit_buffers(struct tx_ring *txr)
 			tx_buffer->map = NULL;
 		}
 	}
-#ifndef IGB_LEGACY_TX
+
 	if (txr->br != NULL)
 		buf_ring_free(txr->br, M_DEVBUF);
-#endif
+
 	if (txr->tx_buffers != NULL) {
 		free(txr->tx_buffers, M_DEVBUF);
 		txr->tx_buffers = NULL;
@@ -4958,10 +4936,10 @@ igb_rxeof(struct igb_queue *que, int count, int *done)
 				rxr->fmp->m_pkthdr.ether_vtag = vtag;
 				rxr->fmp->m_flags |= M_VLANTAG;
 			}
-#ifndef IGB_LEGACY_TX
+
 			rxr->fmp->m_pkthdr.flowid = que->msix;
 			rxr->fmp->m_flags |= M_FLOWID;
-#endif
+
 			sendmp = rxr->fmp;
 			/* Make sure to set M_PKTHDR. */
 			sendmp->m_flags |= M_PKTHDR;
diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c
index 48f85e6..1399987 100644
--- a/sys/dev/oce/oce_if.c
+++ b/sys/dev/oce/oce_if.c
@@ -1063,11 +1063,10 @@ oce_tx_restart(POCE_SOFTC sc, struct oce_wq *wq)
 	if ((sc->ifp->if_drv_flags & IFF_DRV_RUNNING) != IFF_DRV_RUNNING)
 		return;
 
-#if __FreeBSD_version >= 800000
 	if (!drbr_empty(sc->ifp, wq->br))
-#else
+		taskqueue_enqueue_fast(taskqueue_swi, &wq->txtask);
+
 	if (!IFQ_DRV_IS_EMPTY(&sc->ifp->if_snd))
-#endif
 		taskqueue_enqueue_fast(taskqueue_swi, &wq->txtask);
 
 }
@@ -1150,7 +1149,7 @@ oce_tx_task(void *arg, int npending)
 	struct ifnet *ifp = sc->ifp;
 	int rc = 0;
 
-#if __FreeBSD_version >= 800000
+
 	LOCK(&wq->tx_lock);
 	rc = oce_multiq_transmit(ifp, NULL, wq);
 	if (rc) {
@@ -1158,9 +1157,9 @@ oce_tx_task(void *arg, int npending)
 				"TX[%d] restart failed\n", wq->queue_index);
 	}
 	UNLOCK(&wq->tx_lock);
-#else
+
 	oce_start(ifp);
-#endif
+
 
 }
 
diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c
index c342df7..3558365 100644
--- a/sys/dev/virtio/network/if_vtnet.c
+++ b/sys/dev/virtio/network/if_vtnet.c
@@ -139,23 +139,21 @@ static struct mbuf *
 static int	vtnet_txq_enqueue_buf(struct vtnet_txq *, struct mbuf **,
 		    struct vtnet_tx_header *);
 static int	vtnet_txq_encap(struct vtnet_txq *, struct mbuf **);
-#ifdef VTNET_LEGACY_TX
+
 static void	vtnet_start_locked(struct vtnet_txq *, struct ifnet *);
 static void	vtnet_start(struct ifnet *);
-#else
+
 static int	vtnet_txq_mq_start_locked(struct vtnet_txq *, struct mbuf *);
 static int	vtnet_txq_mq_start(struct ifnet *, struct mbuf *);
 static void	vtnet_txq_tq_deferred(void *, int);
-#endif
+
 static void	vtnet_txq_start(struct vtnet_txq *);
 static void	vtnet_txq_tq_intr(void *, int);
 static int	vtnet_txq_eof(struct vtnet_txq *);
 static void	vtnet_tx_vq_intr(void *);
 static void	vtnet_tx_start_all(struct vtnet_softc *);
 
-#ifndef VTNET_LEGACY_TX
 static void	vtnet_qflush(struct ifnet *);
-#endif
 
 static int	vtnet_watchdog(struct vtnet_txq *);
 static void	vtnet_rxq_accum_stats(struct vtnet_rxq *,
@@ -920,16 +918,16 @@ vtnet_setup_interface(struct vtnet_softc *sc)
 	ifp->if_init = vtnet_init;
 	ifp->if_ioctl = vtnet_ioctl;
 
-#ifndef VTNET_LEGACY_TX
+
 	ifp->if_transmit = vtnet_txq_mq_start;
 	ifp->if_qflush = vtnet_qflush;
-#else
+
 	struct virtqueue *vq = sc->vtnet_txqs[0].vtntx_vq;
 	ifp->if_start = vtnet_start;
 	IFQ_SET_MAXLEN(&ifp->if_snd, virtqueue_size(vq) - 1);
 	ifp->if_snd.ifq_drv_maxlen = virtqueue_size(vq) - 1;
 	IFQ_SET_READY(&ifp->if_snd);
-#endif
+
 
 	ifmedia_init(&sc->vtnet_media, IFM_IMASK, vtnet_ifmedia_upd,
 	    vtnet_ifmedia_sts);
@@ -2204,7 +2202,7 @@ fail:
 	return (error);
 }
 
-#ifdef VTNET_LEGACY_TX
+
 
 static void
 vtnet_start_locked(struct vtnet_txq *txq, struct ifnet *ifp)
@@ -2270,7 +2268,7 @@ vtnet_start(struct ifnet *ifp)
 	VTNET_TXQ_UNLOCK(txq);
 }
 
-#else /* !VTNET_LEGACY_TX */
+
 
 static int
 vtnet_txq_mq_start_locked(struct vtnet_txq *txq, struct mbuf *m)
@@ -2381,7 +2379,7 @@ vtnet_txq_tq_deferred(void *xtxq, int pending)
 	VTNET_TXQ_UNLOCK(txq);
 }
 
-#endif /* VTNET_LEGACY_TX */
+
 
 static void
 vtnet_txq_start(struct vtnet_txq *txq)
@@ -2392,13 +2390,13 @@ vtnet_txq_start(struct vtnet_txq *txq)
 	sc = txq->vtntx_sc;
 	ifp = sc->vtnet_ifp;
 
-#ifdef VTNET_LEGACY_TX
+
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 		vtnet_start_locked(txq, ifp);
-#else
+
 	if (!drbr_empty(ifp, txq->vtntx_br))
 		vtnet_txq_mq_start_locked(txq, NULL);
-#endif
+
 }
 
 static void
diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c
index 5767892..d87aba7 100644
--- a/sys/dev/vmware/vmxnet3/if_vmx.c
+++ b/sys/dev/vmware/vmxnet3/if_vmx.c
@@ -166,15 +166,15 @@ static int	vmxnet3_txq_load_mbuf(struct vmxnet3_txqueue *, struct mbuf **,
 		    bus_dmamap_t, bus_dma_segment_t [], int *);
 static void	vmxnet3_txq_unload_mbuf(struct vmxnet3_txqueue *, bus_dmamap_t);
 static int	vmxnet3_txq_encap(struct vmxnet3_txqueue *, struct mbuf **);
-#ifdef VMXNET3_LEGACY_TX
+
 static void	vmxnet3_start_locked(struct ifnet *);
 static void	vmxnet3_start(struct ifnet *);
-#else
+
 static int	vmxnet3_txq_mq_start_locked(struct vmxnet3_txqueue *,
 		    struct mbuf *);
 static int	vmxnet3_txq_mq_start(struct ifnet *, struct mbuf *);
 static void	vmxnet3_txq_tq_deferred(void *, int);
-#endif
+
 static void	vmxnet3_txq_start(struct vmxnet3_txqueue *);
 static void	vmxnet3_tx_start_all(struct vmxnet3_softc *);
 
@@ -1722,15 +1722,15 @@ vmxnet3_setup_interface(struct vmxnet3_softc *sc)
 	ifp->if_ioctl = vmxnet3_ioctl;
 	ifp->if_hw_tsomax = VMXNET3_TSO_MAXSIZE;
 
-#ifdef VMXNET3_LEGACY_TX
+
 	ifp->if_start = vmxnet3_start;
 	ifp->if_snd.ifq_drv_maxlen = sc->vmx_ntxdescs - 1;
 	IFQ_SET_MAXLEN(&ifp->if_snd, sc->vmx_ntxdescs - 1);
 	IFQ_SET_READY(&ifp->if_snd);
-#else
+
 	ifp->if_transmit = vmxnet3_txq_mq_start;
 	ifp->if_qflush = vmxnet3_qflush;
-#endif
+
 
 	vmxnet3_get_lladdr(sc);
 	ether_ifattach(ifp, sc->vmx_lladdr);
@@ -2863,7 +2863,7 @@ vmxnet3_txq_encap(struct vmxnet3_txqueue *txq, struct mbuf **m0)
 	return (0);
 }
 
-#ifdef VMXNET3_LEGACY_TX
+
 
 static void
 vmxnet3_start_locked(struct ifnet *ifp)
@@ -2927,7 +2927,7 @@ vmxnet3_start(struct ifnet *ifp)
 	VMXNET3_TXQ_UNLOCK(txq);
 }
 
-#else /* !VMXNET3_LEGACY_TX */
+
 
 static int
 vmxnet3_txq_mq_start_locked(struct vmxnet3_txqueue *txq, struct mbuf *m)
@@ -3033,7 +3033,7 @@ vmxnet3_txq_tq_deferred(void *xtxq, int pending)
 	VMXNET3_TXQ_UNLOCK(txq);
 }
 
-#endif /* VMXNET3_LEGACY_TX */
+
 
 static void
 vmxnet3_txq_start(struct vmxnet3_txqueue *txq)
@@ -3044,13 +3044,13 @@ vmxnet3_txq_start(struct vmxnet3_txqueue *txq)
 	sc = txq->vxtxq_sc;
 	ifp = sc->vmx_ifp;
 
-#ifdef VMXNET3_LEGACY_TX
+
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 		vmxnet3_start_locked(ifp);
-#else
+
 	if (!drbr_empty(ifp, txq->vxtxq_br))
 		vmxnet3_txq_mq_start_locked(txq, NULL);
-#endif
+
 }
 
 static void