From owner-svn-src-head@FreeBSD.ORG  Thu Jan 20 23:51:03 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A8D721065670;
	Thu, 20 Jan 2011 23:51:03 +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 9804A8FC12;
	Thu, 20 Jan 2011 23:51:03 +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 p0KNp3Fg031873;
	Thu, 20 Jan 2011 23:51:03 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0KNp3Pr031871;
	Thu, 20 Jan 2011 23:51:03 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201101202351.p0KNp3Pr031871@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Thu, 20 Jan 2011 23:51:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217665 - head/sys/mips/cavium/octe
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Jan 2011 23:51:03 -0000

Author: jmallett
Date: Thu Jan 20 23:51:03 2011
New Revision: 217665
URL: http://svn.freebsd.org/changeset/base/217665

Log:
  If there is no WQE available for a packet that needs segmentation, drop it
  and return.

Modified:
  head/sys/mips/cavium/octe/ethernet-tx.c

Modified: head/sys/mips/cavium/octe/ethernet-tx.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-tx.c	Thu Jan 20 23:34:59 2011	(r217664)
+++ head/sys/mips/cavium/octe/ethernet-tx.c	Thu Jan 20 23:51:03 2011	(r217665)
@@ -142,9 +142,14 @@ int cvm_oct_xmit(struct mbuf *m, struct 
 		 * in memory we borrow from the WQE pool.
 		 */
 		work = cvmx_fpa_alloc(CVMX_FPA_WQE_POOL);
-		gp = (uint64_t *)work;
+		if (work == NULL) {
+			m_freem(m);
+			ifp->if_oerrors++;
+			return 1;
+		}
 
 		segs = 0;
+		gp = (uint64_t *)work;
 		for (n = m; n != NULL; n = n->m_next) {
 			if (segs == CVMX_FPA_WQE_POOL_SIZE / sizeof (uint64_t))
 				panic("%s: too many segments in packet; call m_collapse().", __func__);