Index: if_em.c
===================================================================
RCS file: /usr/store/mlaier/fcvs/src/sys/dev/em/if_em.c,v
retrieving revision 1.43
diff -u -r1.43 if_em.c
--- if_em.c	4 Jun 2004 16:57:18 -0000	1.43
+++ if_em.c	19 Jun 2004 02:05:35 -0000
@@ -610,15 +610,15 @@
         if (!adapter->link_active)
                 return;
 
-        while (ifp->if_snd.ifq_head != NULL) {
+        while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) {
 
-                IF_DEQUEUE(&ifp->if_snd, m_head);
+                IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head);
                 
                 if (m_head == NULL) break;
                         
 		if (em_encap(adapter, m_head)) { 
 			ifp->if_flags |= IFF_OACTIVE;
-			IF_PREPEND(&ifp->if_snd, m_head);
+			IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
 			break;
                 }
 
@@ -918,7 +918,7 @@
                 em_clean_transmit_interrupts(adapter);
         }
 	
-        if (ifp->if_flags & IFF_RUNNING && ifp->if_snd.ifq_head != NULL)
+        if (ifp->if_flags & IFF_RUNNING && !IFQ_DRV_IS_EMPTY(&ifp->if_snd))
                 em_start_locked(ifp);
 }
         
@@ -988,7 +988,7 @@
                 loop_cnt--;
         }
                  
-        if (ifp->if_flags & IFF_RUNNING && ifp->if_snd.ifq_head != NULL)
+        if (ifp->if_flags & IFF_RUNNING && IFQ_DRV_IS_EMPTY(&ifp->if_snd))
                 em_start_locked(ifp);
 
 	EM_UNLOCK(adapter);
@@ -1854,7 +1854,9 @@
 	ifp->if_ioctl = em_ioctl;
 	ifp->if_start = em_start;
 	ifp->if_watchdog = em_watchdog;
-	ifp->if_snd.ifq_maxlen = adapter->num_tx_desc - 1;
+	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);
 
 #if __FreeBSD_version < 500000
         ether_ifattach(ifp, ETHER_BPF_SUPPORTED);