svn commit: r199865 - stable/8/sys/dev/tsec

Rafal Jaworowski raj at FreeBSD.org
Fri Nov 27 13:39:00 UTC 2009


Author: raj
Date: Fri Nov 27 13:38:59 2009
New Revision: 199865
URL: http://svn.freebsd.org/changeset/base/199865

Log:
  MFC r199580:
  
  tsec: Use IFQ_DRV macros for managing interface packet queue.
  
  This lets tsec(4) work with ALTQ.
  
  Submitted by:	Marcin Ligenza

Modified:
  stable/8/sys/dev/tsec/if_tsec.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/tsec/if_tsec.c
==============================================================================
--- stable/8/sys/dev/tsec/if_tsec.c	Fri Nov 27 13:19:06 2009	(r199864)
+++ stable/8/sys/dev/tsec/if_tsec.c	Fri Nov 27 13:38:59 2009	(r199865)
@@ -716,9 +716,9 @@ tsec_start_locked(struct ifnet *ifp)
 	bus_dmamap_sync(sc->tsec_tx_dtag, sc->tsec_tx_dmap,
 	    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 
-	for (;;) {
+	while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) {
 		/* Get packet from the queue */
-		IF_DEQUEUE(&ifp->if_snd, m0);
+		IFQ_DRV_DEQUEUE(&ifp->if_snd, m0);
 		if (m0 == NULL)
 			break;
 
@@ -755,7 +755,7 @@ tsec_start_locked(struct ifnet *ifp)
 			m0 = mtmp;
 
 		if (tsec_encap(sc, m0, fcb_inserted)) {
-			IF_PREPEND(&ifp->if_snd, m0);
+			IFQ_DRV_PREPEND(&ifp->if_snd, m0);
 			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
 			break;
 		}


More information about the svn-src-stable-8 mailing list