Importing pfSense patch iface_iftx_altq_hybrid.diff

1 files changed, 27 insertions, 27 deletions

diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 9ed3f36..5248f7f 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -211,15 +211,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 *);
 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 *);
@@ -918,13 +918,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);
-#else
+
 			if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 				em_start_locked(ifp, txr);
-#endif
+
 			EM_TX_UNLOCK(txr);
 		}
 	}
@@ -934,7 +934,7 @@ em_resume(device_t dev)
 }
 
 
-#ifndef EM_MULTIQUEUE
+
 static void
 em_start_locked(struct ifnet *ifp, struct tx_ring *txr)
 {
@@ -997,7 +997,7 @@ em_start(struct ifnet *ifp)
 	}
 	return;
 }
-#else /* EM_MULTIQUEUE */
+
 /*********************************************************************
  *  Multiqueue Transmit routines 
  *
@@ -1104,7 +1104,7 @@ em_qflush(struct ifnet *ifp)
 	}
 	if_qflush(ifp);
 }
-#endif /* EM_MULTIQUEUE */
+
 
 /*********************************************************************
  *  Ioctl entry point
@@ -1498,13 +1498,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);
-#else
+
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 		em_start_locked(ifp, txr);
-#endif
+
 	EM_TX_UNLOCK(txr);
 
 	return (rx_done);
@@ -1572,13 +1572,13 @@ em_handle_que(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);
-#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);
@@ -1606,13 +1606,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);
-#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);
@@ -1707,13 +1707,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);
-#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);
 }
@@ -1737,13 +1737,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);
-#else
+
 			if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 				em_start_locked(ifp, txr);
-#endif
+
 			EM_TX_UNLOCK(txr);
 		}
 	}
@@ -3078,16 +3078,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);