remove the altq classifier code which is replaced by pf and no longer used.

ok henning@, deraadt@

13 files changed, 26 insertions, 214 deletions

diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c
index ff375ab77bf..a72c2c07914 100644
--- a/sys/net/if_arcsubr.c
+++ b/sys/net/if_arcsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_arcsubr.c,v 1.13 2002/09/15 16:02:13 niklas Exp $	*/
+/*	$OpenBSD: if_arcsubr.c,v 1.14 2003/01/07 09:00:33 kjc Exp $	*/
 /*	$NetBSD: if_arcsubr.c,v 1.8 1996/05/07 02:40:29 thorpej Exp $	*/
 
 /*
@@ -104,7 +104,6 @@ arc_output(ifp, m0, dst, rt0)
 	int			s, error, newencoding, len;
 	u_int8_t		atype, adst;
 	int			tfrags, sflag, fsflag, rsflag;
-	ALTQ_DECL(struct altq_pktattr pktattr;)
 
 	if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING)) 
 		return (ENETDOWN); /* m, m1 aren't initialized yet */
@@ -137,12 +136,6 @@ arc_output(ifp, m0, dst, rt0)
 				senderr(rt == rt0 ? EHOSTDOWN : EHOSTUNREACH);
 	}
 
-	/*
-	 * if the queueing discipline needs packet classification,
-	 * do it before prepending link headers.
-	 */
-	IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family, &pktattr);
-
 	switch (dst->sa_family) {
 #ifdef INET
 	case AF_INET:
@@ -222,7 +215,7 @@ arc_output(ifp, m0, dst, rt0)
 			 * Queue message on interface, and start output if 
 			 * interface not yet active.
 			 */
-			IFQ_ENQUEUE(&ifp->if_snd, m, &pktattr, error);
+			IFQ_ENQUEUE(&ifp->if_snd, m, NULL, error);
 			if (error) {
 				/* mbuf is already freed */
 				splx(s);
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index 10157665c38..42ca58844c9 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_atmsubr.c,v 1.20 2002/06/30 14:09:32 art Exp $       */
+/*      $OpenBSD: if_atmsubr.c,v 1.21 2003/01/07 09:00:33 kjc Exp $       */
 
 /*
  *
@@ -141,19 +141,11 @@ atm_output(ifp, m0, dst, rt0)
 	register struct rtentry *rt;
 	struct atmllc *atmllc;
 	u_int32_t atm_flags;
-	ALTQ_DECL(struct altq_pktattr pktattr;)
 
 	if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING))
 		senderr(ENETDOWN);
 
 	/*
-	 * if the queueing discipline needs packet classification,
-	 * do it before prepending link headers.
-	 */
-	IFQ_CLASSIFY(&ifp->if_snd, m,
-		     (dst != NULL ? dst->sa_family : AF_UNSPEC), &pktattr);
-
-	/*
 	 * check route
 	 */
 	if ((rt = rt0) != NULL) {
@@ -265,7 +257,7 @@ atm_output(ifp, m0, dst, rt0)
 	 */
 	len = m->m_pkthdr.len;
 	s = splimp();
-	IFQ_ENQUEUE(&ifp->if_snd, m, &pktattr, error);
+	IFQ_ENQUEUE(&ifp->if_snd, m, NULL, error);
 	if (error) {
 		splx(s);
 		return (error);
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index d0284c4857f..57d8748af26 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bridge.c,v 1.107 2003/01/03 15:57:56 jason Exp $	*/
+/*	$OpenBSD: if_bridge.c,v 1.108 2003/01/07 09:00:33 kjc Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -2605,15 +2605,10 @@ bridge_ifenqueue(sc, ifp, m)
 {
 	int error, len;
 	short mflags;
-	ALTQ_DECL(struct altq_pktattr pktattr;)
 
 	len = m->m_pkthdr.len;
 	mflags = m->m_flags;
-#ifdef ALTQ
-	if (ALTQ_IS_ENABLED(&ifp->if_snd))
-		altq_etherclassify(&ifp->if_snd, m, &pktattr);
-#endif
-	IFQ_ENQUEUE(&ifp->if_snd, m, &pktattr, error);
+	IFQ_ENQUEUE(&ifp->if_snd, m, NULL, error);
 	if (error) {
 		sc->sc_if.if_oerrors++;
 		return (error);
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 046778961f7..70b5c4e2207 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ethersubr.c,v 1.66 2002/09/11 05:38:47 itojun Exp $	*/
+/*	$OpenBSD: if_ethersubr.c,v 1.67 2003/01/07 09:00:33 kjc Exp $	*/
 /*	$NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $	*/
 
 /*
@@ -254,7 +254,6 @@ ether_output(ifp, m0, dst, rt0)
 	register struct ether_header *eh;
 	struct arpcom *ac = (struct arpcom *)ifp;
 	short mflags;
-	ALTQ_DECL(struct altq_pktattr pktattr;)
 
 	if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING))
 		senderr(ENETDOWN);
@@ -281,12 +280,6 @@ ether_output(ifp, m0, dst, rt0)
 				senderr(rt == rt0 ? EHOSTDOWN : EHOSTUNREACH);
 	}
 
-	/*
-	 * if the queueing discipline needs packet classification,
-	 * do it before prepending link headers.
-	 */
-	IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family, &pktattr);
-
 	switch (dst->sa_family) {
 
 #ifdef INET
@@ -572,7 +565,7 @@ ether_output(ifp, m0, dst, rt0)
 	 * Queue message on interface, and start output if interface
 	 * not yet active.
 	 */
-	IFQ_ENQUEUE(&ifp->if_snd, m, &pktattr, error);
+	IFQ_ENQUEUE(&ifp->if_snd, m, NULL, error);
 	if (error) {
 		/* mbuf is already freed */
 		splx(s);
@@ -592,99 +585,6 @@ bad:
 	return (error);
 }
 
-#ifdef ALTQ
-/*
- * This routine is a slight hack to allow a packet to be classified
- * if the Ethernet headers are present.  It will go away when ALTQ's
- * classification engine understands link headers.
- */
-void
-altq_etherclassify(struct ifaltq *ifq, struct mbuf *m,
-    struct altq_pktattr *pktattr)
-{
-	struct ether_header *eh;
-	u_int16_t ether_type;
-	int hlen, af, hdrsize;
-	caddr_t hdr;
-
-	hlen = ETHER_HDR_LEN;
-	eh = mtod(m, struct ether_header *);
-
-	ether_type = htons(eh->ether_type);
-
-	if (ether_type < ETHERMTU) {
-		/* LLC/SNAP */
-		struct llc *llc = (struct llc *)(eh + 1);
-		hlen += 8;
-
-		if (m->m_len < hlen ||
-		    llc->llc_dsap != LLC_SNAP_LSAP ||
-		    llc->llc_ssap != LLC_SNAP_LSAP ||
-		    llc->llc_control != LLC_UI) {
-			/* Not SNAP. */
-			goto bad;
-		}
-
-		ether_type = htons(llc->llc_un.type_snap.ether_type);
-	}
-
-	switch (ether_type) {
-	case ETHERTYPE_IP:
-		af = AF_INET;
-		hdrsize = 20;		/* sizeof(struct ip) */
-		break;
-
-	case ETHERTYPE_IPV6:
-		af = AF_INET6;
-		hdrsize = 40;		/* sizeof(struct ip6_hdr) */
-		break;
-
-	default:
-		af = AF_UNSPEC;
-		hdrsize = 0;
-		break;
-	}
-
-	while (m->m_len <= hlen) {
-		hlen -= m->m_len;
-		m = m->m_next;
-	}
-	if (m->m_len < (hlen + hdrsize)) {
-		/*
-		 * protocol header not in a single mbuf.
-		 * We can't cope with this situation right now
-		 * (but it shouldn't ever happen, really, anyhow).
-		 */
-#ifdef DEBUG
-		printf("altq_etherclassify: headers span multiple mbufs: "
-		    "%d < %d\n", m->m_len, (hlen + hdrsize));
-#endif
-		goto bad;
-	}
-
-	m->m_data += hlen;
-	m->m_len -= hlen;
-
-	hdr = mtod(m, caddr_t);
-
-	if (ALTQ_NEEDS_CLASSIFY(ifq))
-		pktattr->pattr_class =
-		    (*ifq->altq_classify)(ifq->altq_clfier, m, af);
-	pktattr->pattr_af = af;
-	pktattr->pattr_hdr = hdr;
-
-	m->m_data -= hlen;
-	m->m_len += hlen;
-
-	return;
-
- bad:
-	pktattr->pattr_class = NULL;
-	pktattr->pattr_hdr = NULL;
-	pktattr->pattr_af = AF_UNSPEC;
-}
-#endif /* ALTQ */
-
 /*
  * Temporary function to migrate while
  * removing ether_header * from ether_input().
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index aa5c253f921..5c210c2c084 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fddisubr.c,v 1.29 2002/06/30 13:04:36 itojun Exp $	*/
+/*	$OpenBSD: if_fddisubr.c,v 1.30 2003/01/07 09:00:33 kjc Exp $	*/
 /*	$NetBSD: if_fddisubr.c,v 1.5 1996/05/07 23:20:21 christos Exp $	*/
 
 /*
@@ -185,7 +185,6 @@ fddi_output(ifp, m0, dst, rt0)
 	struct mbuf *mcopy = (struct mbuf *)0;
 	register struct fddi_header *fh;
 	struct arpcom *ac = (struct arpcom *)ifp;
-	ALTQ_DECL(struct altq_pktattr pktattr;)
 	short mflags;
 
 	if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING))
@@ -213,12 +212,6 @@ fddi_output(ifp, m0, dst, rt0)
 				senderr(rt == rt0 ? EHOSTDOWN : EHOSTUNREACH);
 	}
 
-	/*
-	 * If the queueing discipline needs packet classification,
-	 * do it before prepending link headers.
-	 */
-	IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family, &pktattr);
-
 	switch (dst->sa_family) {
 
 #ifdef INET
@@ -471,7 +464,7 @@ fddi_output(ifp, m0, dst, rt0)
 	 * Queue message on interface, and start output if interface
 	 * not yet active.
 	 */
-	IFQ_ENQUEUE(&ifp->if_snd, m, &pktattr, error);
+	IFQ_ENQUEUE(&ifp->if_snd, m, NULL, error);
 	if (error) {
 		/* mbuf is already freed */
 		splx(s);
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 2a15e53f12c..e9007158fd5 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_loop.c,v 1.25 2002/09/11 05:38:47 itojun Exp $	*/
+/*	$OpenBSD: if_loop.c,v 1.26 2003/01/07 09:00:33 kjc Exp $	*/
 /*	$NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $	*/
 
 /*
@@ -266,16 +266,9 @@ looutput(ifp, m, dst, rt)
 	 */
 	if ((ALTQ_IS_ENABLED(&ifp->if_snd) || TBR_IS_ENABLED(&ifp->if_snd))
 	    && ifp->if_start == lo_altqstart) {
-		struct altq_pktattr pktattr;
 		int32_t *afp;
 	        int error;
 
-		/*
-		 * if the queueing discipline needs packet classification,
-		 * do it before prepending link headers.
-		 */
-		IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family, &pktattr);
-
 		M_PREPEND(m, sizeof(int32_t), M_DONTWAIT);
 		if (m == 0)
 			return (ENOBUFS);
@@ -283,7 +276,7 @@ looutput(ifp, m, dst, rt)
 		*afp = (int32_t)dst->sa_family;
 
 	        s = splimp();
-		IFQ_ENQUEUE(&ifp->if_snd, m, &pktattr, error);
+		IFQ_ENQUEUE(&ifp->if_snd, m, NULL, error);
 		(*ifp->if_start)(ifp);
 		splx(s);
 		return (error);
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 3cd5ad47fab..7ee803b7dbc 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.c,v 1.31 2002/07/01 19:31:34 deraadt Exp $	*/
+/*	$OpenBSD: if_ppp.c,v 1.32 2003/01/07 09:00:33 kjc Exp $	*/
 /*	$NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $	*/
 
 /*
@@ -680,7 +680,6 @@ pppoutput(ifp, m0, dst, rtp)
     enum NPmode mode;
     int len;
     struct mbuf *m;
-    ALTQ_DECL(struct altq_pktattr pktattr;)
 
     if (sc->sc_devp == NULL || (ifp->if_flags & IFF_RUNNING) == 0
 	|| ((ifp->if_flags & IFF_UP) == 0 && dst->sa_family != AF_UNSPEC)) {
@@ -688,8 +687,6 @@ pppoutput(ifp, m0, dst, rtp)
 	goto bad;
     }
 
-    IFQ_CLASSIFY(&ifp->if_snd, m0, dst->sa_family, &pktattr);
-
     /*
      * Compute PPP header.
      */
@@ -822,7 +819,7 @@ pppoutput(ifp, m0, dst, rtp)
 		error = 0;
 	    }
 	} else
-	    IFQ_ENQUEUE(&sc->sc_if.if_snd, m0, &pktattr, error);
+	    IFQ_ENQUEUE(&sc->sc_if.if_snd, m0, NULL, error);
 	if (error) {
 	    splx(s);
 	    sc->sc_if.if_oerrors++;
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index b7e413803d5..d9b16826e61 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sl.c,v 1.17 2002/09/11 05:38:47 itojun Exp $	*/
+/*	$OpenBSD: if_sl.c,v 1.18 2003/01/07 09:00:33 kjc Exp $	*/
 /*	$NetBSD: if_sl.c,v 1.39.4.1 1996/06/02 16:26:31 thorpej Exp $	*/
 
 /*
@@ -386,9 +386,6 @@ sloutput(ifp, m, dst, rtp)
 	register struct sl_softc *sc = ifp->if_softc;
 	register struct ip *ip;
 	int s, error;
-	ALTQ_DECL(struct altq_pktattr pktattr;)
-
-	IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family, &pktattr);
 
 	/*
 	 * `Cannot happen' (see slioctl).  Someday we will extend
@@ -427,7 +424,7 @@ sloutput(ifp, m, dst, rtp)
 			slstart(sc->sc_ttyp);
 		}
 	}
-	IFQ_ENQUEUE(&sc->sc_if.if_snd, m, &pktattr, error);
+	IFQ_ENQUEUE(&sc->sc_if.if_snd, m, NULL, error);
 	if (error) {
 		splx(s);
 		sc->sc_if.if_oerrors++;
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 151ddc27c97..25856a5ff72 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_spppsubr.c,v 1.16 2002/09/26 20:43:54 chris Exp $	*/
+/*	$OpenBSD: if_spppsubr.c,v 1.17 2003/01/07 09:00:33 kjc Exp $	*/
 /*
  * Synchronous PPP/Cisco link level subroutines.
  * Keepalive protocol implemented in both Cisco and PPP modes.
@@ -653,7 +653,6 @@ sppp_output(struct ifnet *ifp, struct mbuf *m,
 	struct ppp_header *h;
 	struct ifqueue *ifq = NULL;
 	int s, len, rv = 0;
-	ALTQ_DECL(struct altq_pktattr pktattr;)
 
 	s = splimp();
 
@@ -675,12 +674,6 @@ sppp_output(struct ifnet *ifp, struct mbuf *m,
 		s = splimp();
 	}
 
-	/*
-	 * if the queueing discipline needs packet classification,
-	 * do it before prepending link headers.
-	 */
-	IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family, &pktattr);
-
 #ifdef INET
 	/*
 	 * Put low delay, telnet, rlogin and ftp control packets
@@ -814,7 +807,7 @@ nosupport:
 		}
 		IF_ENQUEUE (ifq, m);
 	} else
-		IFQ_ENQUEUE(&ifp->if_snd, m, &pktattr, rv);
+		IFQ_ENQUEUE(&ifp->if_snd, m, NULL, rv);
 	if (rv != 0) {
 		++ifp->if_oerrors;
 		splx (s);
diff --git a/sys/net/if_strip.c b/sys/net/if_strip.c
index 825f81fc6ab..f9b31036eba 100644
--- a/sys/net/if_strip.c
+++ b/sys/net/if_strip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_strip.c,v 1.22 2002/09/11 05:38:47 itojun Exp $	*/
+/*	$OpenBSD: if_strip.c,v 1.23 2003/01/07 09:00:33 kjc Exp $	*/
 /*	$NetBSD: if_strip.c,v 1.2.4.3 1996/08/03 00:58:32 jtc Exp $	*/
 /*	from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $	*/
 
@@ -717,7 +717,6 @@ stripoutput(ifp, m, dst, rt)
 	register u_char *dldst;		/* link-level next-hop */
 	int s;
 	u_char dl_addrbuf[STARMODE_ADDR_LEN+1];
-	ALTQ_DECL(struct altq_pktattr pktattr;)
 
 	/*
 	 * Verify tty line is up and alive.
@@ -745,11 +744,6 @@ stripoutput(ifp, m, dst, rt)
 		printf("\n");
 	}
 #endif
-	/*
-	 * if the queueing discipline needs packet classification,
-	 * do it before prepending link headers.
-	 */
-	IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family, &pktattr);
 
 	switch (dst->sa_family) {
 	case AF_INET:
@@ -863,7 +857,7 @@ stripoutput(ifp, m, dst, rt)
 			error = 0;
 		}
 	} else
-		IFQ_ENQUEUE(&sc->sc_if.if_snd, m, &pktattr, error);
+		IFQ_ENQUEUE(&sc->sc_if.if_snd, m, NULL, error);
 	if (error) {
 		splx(s);
 		sc->sc_if.if_oerrors++;
diff --git a/sys/net/if_tokensubr.c b/sys/net/if_tokensubr.c
index 7930b72882c..815c7a0a8a8 100644
--- a/sys/net/if_tokensubr.c
+++ b/sys/net/if_tokensubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tokensubr.c,v 1.8 2002/07/18 03:26:59 mickey Exp $	*/
+/*	$OpenBSD: if_tokensubr.c,v 1.9 2003/01/07 09:00:33 kjc Exp $	*/
 /*	$NetBSD: if_tokensubr.c,v 1.7 1999/05/30 00:39:07 bad Exp $	*/
 
 /*
@@ -152,7 +152,6 @@ token_output(ifp, m0, dst, rt0)
 	struct token_rif *rif = (struct  token_rif *)0;
 	struct token_rif bcastrif;
 	size_t riflen = 0;
-	ALTQ_DECL(struct altq_pktattr pktattr;)
 	short mflags;
 
 	if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING))
@@ -180,12 +179,6 @@ token_output(ifp, m0, dst, rt0)
 				senderr(rt == rt0 ? EHOSTDOWN : EHOSTUNREACH);
 	}
 
-	/*
-	 * If the queueing discipline needs packet classification,
-	 * do it before prepending link headers.
-	 */
-	IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family, &pktattr);
-
 	switch (dst->sa_family) {
 
 #ifdef INET
@@ -455,7 +448,7 @@ send:
 	 * Queue message on interface, and start output if interface
 	 * not yet active.
 	 */
-	IFQ_ENQUEUE(&ifp->if_snd, m, &pktattr, error);
+	IFQ_ENQUEUE(&ifp->if_snd, m, NULL, error);
 	if (error) {
 		/* mbuf is already freed */
 		splx(s);
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 5c162249014..6ff8d974943 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tun.c,v 1.44 2002/12/06 15:58:49 nate Exp $	*/
+/*	$OpenBSD: if_tun.c,v 1.45 2003/01/07 09:00:34 kjc Exp $	*/
 /*	$NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $	*/
 
 /*
@@ -377,7 +377,6 @@ tun_output(ifp, m0, dst, rt)
 	struct tun_softc *tp = ifp->if_softc;
 	int		s, len, error;
 	u_int32_t	*af;
-	ALTQ_DECL(struct altq_pktattr pktattr;)
 
 	TUNDEBUG(("%s: tun_output\n", ifp->if_xname));
 
@@ -388,12 +387,6 @@ tun_output(ifp, m0, dst, rt)
 		return EHOSTDOWN;
 	}
 
-	/*
-	 * if the queueing discipline needs packet classification,
-	 * do it before prepending link headers.
-	 */
-	IFQ_CLASSIFY(&ifp->if_snd, m0, dst->sa_family, &pktattr);
- 
 	M_PREPEND(m0, sizeof(*af), M_DONTWAIT);
 	af = mtod(m0, u_int32_t *);
 	*af = htonl(dst->sa_family);
@@ -405,7 +398,7 @@ tun_output(ifp, m0, dst, rt)
 
 	len = m0->m_pkthdr.len + sizeof(*af);
 	s = splimp();
-	IFQ_ENQUEUE(&ifp->if_snd, m0, &pktattr, error);
+	IFQ_ENQUEUE(&ifp->if_snd, m0, NULL, error);
 	if (error) {
 		splx(s);
 		ifp->if_collisions++;
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index d2c873ea8f5..2d14112c4ff 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vlan.c,v 1.32 2002/06/12 01:42:29 chris Exp $ */
+/*	$OpenBSD: if_vlan.c,v 1.33 2003/01/07 09:00:34 kjc Exp $ */
 /*
  * Copyright 1998 Massachusetts Institute of Technology
  *
@@ -137,7 +137,6 @@ vlan_start(struct ifnet *ifp)
 	struct ifnet *p;
 	struct mbuf *m, *m0;
 	int error;
-	ALTQ_DECL(struct altq_pktattr pktattr;)
 
 	ifv = ifp->if_softc;
 	p = ifv->ifv_p;
@@ -158,26 +157,6 @@ vlan_start(struct ifnet *ifp)
 			continue;
 		}
 
-#ifdef ALTQ
-		/*
-		 * If ALTQ is enabled on the parent interface, do
-		 * classification; the queueing discipline might
-		 * not require classification, but might require
-		 * the address family/header pointer in the pktattr.
-		 */
-		if (ALTQ_IS_ENABLED(&p->if_snd)) {
-			switch (p->if_type) {
-			case IFT_ETHER:
-				altq_etherclassify(&p->if_snd, m, &pktattr);
-				break;
-#ifdef DIAGNOSTIC
-			default:
-				panic("vlan_start: impossible (altq)");
-#endif
-			}
-		}
-#endif /* ALTQ */
-
 #if NBPFILTER > 0
 		if (ifp->if_bpf)
 			bpf_mtap(ifp->if_bpf, m);
@@ -239,7 +218,7 @@ vlan_start(struct ifnet *ifp)
 		p->if_obytes += m->m_pkthdr.len;
 		if (m->m_flags & M_MCAST)
 			p->if_omcasts++;
-		IFQ_ENQUEUE(&p->if_snd, m, &pktattr, error);
+		IFQ_ENQUEUE(&p->if_snd, m, NULL, error);
 		if (error) {
 			/* mbuf is already freed */
 			ifp->if_oerrors++;