Index: ip_output.c
===================================================================
RCS file: /usr/store/mlaier/fcvs/src/sys/netinet/ip_output.c,v
retrieving revision 1.226
diff -c -r1.226 ip_output.c
*** ip_output.c	18 Aug 2004 00:37:46 -0000	1.226
--- ip_output.c	22 Aug 2004 16:14:13 -0000
***************
*** 370,392 ****
  		}
  	}
  #endif /* notdef */
- #ifdef ALTQ
- 	/*
- 	 * disable packet drop hack.
- 	 * packetdrop should be done by queueing.
- 	 */
- #else /* !ALTQ */
  	/*
! 	 * Verify that we have any chance at all of being able to queue
! 	 *      the packet or packet fragments
  	 */
  	if ((ifp->if_snd.ifq_len + ip->ip_len / ifp->if_mtu + 1) >=
! 		ifp->if_snd.ifq_maxlen) {
! 			error = ENOBUFS;
! 			ipstat.ips_odropped++;
! 			goto bad;
  	}
- #endif /* !ALTQ */
  
  	/*
  	 * Look for broadcast address and
--- 370,393 ----
  		}
  	}
  #endif /* notdef */
  	/*
! 	 * Verify that we have any chance at all of being able to queue the
! 	 * packet or packet fragments, unless ALTQ is enabled on the given
! 	 * interface in which case packetdrop should be done by queueing.
  	 */
+ #ifdef ALTQ
+ 	if ((!ALTQ_IS_ENABLED(&ifp->if_snd)) &&
+ 	    ((ifp->if_snd.ifq_len + ip->ip_len / ifp->if_mtu + 1) >=
+ 	    ifp->if_snd.ifq_maxlen))
+ #else
  	if ((ifp->if_snd.ifq_len + ip->ip_len / ifp->if_mtu + 1) >=
! 	    ifp->if_snd.ifq_maxlen)
! #endif /* ALTQ */
! 	{
! 		error = ENOBUFS;
! 		ipstat.ips_odropped++;
! 		goto bad;
  	}
  
  	/*
  	 * Look for broadcast address and