svn commit: r207252 - user/jmallett/octeon/sys/mips/cavium/octe

[Juli Mallett]

Author: jmallett
Date: Mon Apr 26 21:10:10 2010
New Revision: 207252
URL: http://svn.freebsd.org/changeset/base/207252

Log:
  o) Remove comment about clearing OACTIVE.  We do that now (though through a
     callout, so perhaps not optimal.)
  o) Remove mbuf copying for BPF_MTAP.  We can live without it for now and it is
     a monumental performance hit.

Modified:
  user/jmallett/octeon/sys/mips/cavium/octe/octe.c

Modified: user/jmallett/octeon/sys/mips/cavium/octe/octe.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octe/octe.c	Mon Apr 26 21:08:15 2010	(r207251)
+++ user/jmallett/octeon/sys/mips/cavium/octe/octe.c	Mon Apr 26 21:10:10 2010	(r207252)
@@ -261,7 +261,7 @@ static void
 octe_start(struct ifnet *ifp)
 {
 	cvm_oct_private_t *priv;
-	struct mbuf *m, *n;
+	struct mbuf *m;
 	int error;
 
 	priv = ifp->if_softc;
@@ -295,7 +295,6 @@ octe_start(struct ifnet *ifp)
 		 * how to defrag mbufs for itself and that it will handle the
 		 * failure cases internally.
 		 */
-		n = m_dup(m, M_DONTWAIT);
 
 		if (priv->queue != -1) {
 			error = cvm_oct_xmit(m, ifp);
@@ -304,21 +303,9 @@ octe_start(struct ifnet *ifp)
 		}
 
 		if (error != 0) {
-			/*
-			 * XXX
-			 * Need to implement freeing and clearing of
-			 * OACTIVE at some point.
-			 */
-			if (n != NULL)
-				IFQ_DRV_PREPEND(&ifp->if_snd, n);
 			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
 			return;
 		}
-
-		if (n != NULL) {
-			BPF_MTAP(ifp, n);
-			m_freem(n);
-		}
 	}
 }