From owner-svn-src-user@FreeBSD.ORG  Sat Apr 24 22:23:50 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 2B7C2106566C;
	Sat, 24 Apr 2010 22:23:50 +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 1BA548FC0C;
	Sat, 24 Apr 2010 22:23:50 +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 o3OMNoDM063815;
	Sat, 24 Apr 2010 22:23:50 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3OMNnRp063812;
	Sat, 24 Apr 2010 22:23:49 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004242223.o3OMNnRp063812@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sat, 24 Apr 2010 22:23:49 +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: r207167 - 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: Sat, 24 Apr 2010 22:23:50 -0000

Author: jmallett
Date: Sat Apr 24 22:23:49 2010
New Revision: 207167
URL: http://svn.freebsd.org/changeset/base/207167

Log:
  o) Return nonzero if we drop the outgoing packet.
  o) Do not continue trying to transmit packets if we drop a packet outgoing.

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

Modified: user/jmallett/octeon/sys/mips/cavium/octe/ethernet-tx.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octe/ethernet-tx.c	Sat Apr 24 22:16:01 2010	(r207166)
+++ user/jmallett/octeon/sys/mips/cavium/octe/ethernet-tx.c	Sat Apr 24 22:23:49 2010	(r207167)
@@ -322,7 +322,7 @@ dont_put_mbuf_in_hw:
 		IF_UNLOCK(&priv->tx_free_queue[qos]);
 	}
 
-	return 0;
+	return dropped;
 }
 
 

Modified: user/jmallett/octeon/sys/mips/cavium/octe/octe.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octe/octe.c	Sat Apr 24 22:16:01 2010	(r207166)
+++ user/jmallett/octeon/sys/mips/cavium/octe/octe.c	Sat Apr 24 22:23:49 2010	(r207167)
@@ -278,6 +278,7 @@ octe_start(struct ifnet *ifp)
 			 * not free the packets?
 			 */
 			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
+			return;
 		}
 
 		BPF_MTAP(ifp, m);