From 5086a51b85ae360be61a54f0efd0f40ff7c4980d Mon Sep 17 00:00:00 2001
From: mlaier <mlaier@FreeBSD.org>
Date: Sat, 17 Jun 2006 16:46:04 +0000
Subject: [PATCH] MFC:   ALTQ-ify nve(4).

  Submitted by:   Chris Dionissopoulos
---
 share/man/man4/altq.4 | 3 ++-
 sys/dev/nve/if_nve.c  | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/share/man/man4/altq.4 b/share/man/man4/altq.4
index d87e0d775da9..2f837ad80129 100644
--- a/share/man/man4/altq.4
+++ b/share/man/man4/altq.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 31, 2006
+.Dd May 20, 2006
 .Dt ALTQ 4
 .Os
 .Sh NAME
@@ -128,6 +128,7 @@ They have been applied to the following hardware drivers:
 .Xr hme 4 ,
 .Xr le 4 ,
 .Xr lnc 4 ,
+.Xr nve 4 ,
 .Xr re 4 ,
 .Xr rl 4 ,
 .Xr sf 4 ,
diff --git a/sys/dev/nve/if_nve.c b/sys/dev/nve/if_nve.c
index 07af6ea03928..7f2a966cad1c 100644
--- a/sys/dev/nve/if_nve.c
+++ b/sys/dev/nve/if_nve.c
@@ -521,7 +521,9 @@ nve_attach(device_t dev)
 	ifp->if_init = nve_init;
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_baudrate = IF_Mbps(100);
-	ifp->if_snd.ifq_maxlen = TX_RING_SIZE - 1;
+	IFQ_SET_MAXLEN(&ifp->if_snd, TX_RING_SIZE - 1);
+	ifp->if_snd.ifq_drv_maxlen = TX_RING_SIZE - 1;
+	IFQ_SET_READY(&ifp->if_snd);
 	ifp->if_capabilities |= IFCAP_VLAN_MTU;
 
 	/* Attach to OS's managers. */
@@ -861,7 +863,7 @@ nve_ifstart_locked(struct ifnet *ifp)
 		buf = &desc->buf;
 
 		/* Get next packet to send. */
-		IF_DEQUEUE(&ifp->if_snd, m0);
+		IFQ_DRV_DEQUEUE(&ifp->if_snd, m0);
 
 		/* If nothing to send, return. */
 		if (m0 == NULL)
@@ -940,7 +942,7 @@ nve_ifstart_locked(struct ifnet *ifp)
 			    "nve_ifstart: transmit queue is full\n");
 			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
 			bus_dmamap_unload(sc->mtag, buf->map);
-			IF_PREPEND(&ifp->if_snd, buf->mbuf);
+			IFQ_DRV_PREPEND(&ifp->if_snd, buf->mbuf);
 			buf->mbuf = NULL;
 			return;