From owner-svn-src-user@FreeBSD.ORG  Mon Apr 26 21:10:10 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5C7921065680;
	Mon, 26 Apr 2010 21:10:10 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4BA138FC1A;
	Mon, 26 Apr 2010 21:10:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3QLAAeB001528;
	Mon, 26 Apr 2010 21:10:10 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3QLAA4r001526;
	Mon, 26 Apr 2010 21:10:10 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004262110.o3QLAA4r001526@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Mon, 26 Apr 2010 21:10:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207252 - user/jmallett/octeon/sys/mips/cavium/octe
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Apr 2010 21:10:10 -0000

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);
-		}
 	}
 }