From owner-svn-src-projects@FreeBSD.ORG  Tue Feb  3 04:37:46 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 19EBF106567C;
	Tue,  3 Feb 2009 04:37:46 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 095808FC16;
	Tue,  3 Feb 2009 04:37:46 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n134bj8V017321;
	Tue, 3 Feb 2009 04:37:45 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n134bjMr017320;
	Tue, 3 Feb 2009 04:37:45 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200902030437.n134bjMr017320@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 3 Feb 2009 04:37:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188047 - projects/releng_7_xen/sys/dev/xen/netfront
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Feb 2009 04:37:46 -0000

Author: kmacy
Date: Tue Feb  3 04:37:45 2009
New Revision: 188047
URL: http://svn.freebsd.org/changeset/base/188047

Log:
  IFC 188036
  break out of loop if we run out of mbufs

Modified:
  projects/releng_7_xen/sys/dev/xen/netfront/netfront.c

Modified: projects/releng_7_xen/sys/dev/xen/netfront/netfront.c
==============================================================================
--- projects/releng_7_xen/sys/dev/xen/netfront/netfront.c	Tue Feb  3 04:36:23 2009	(r188046)
+++ projects/releng_7_xen/sys/dev/xen/netfront/netfront.c	Tue Feb  3 04:37:45 2009	(r188047)
@@ -1235,11 +1235,12 @@ xennet_get_responses(struct netfront_inf
 		gnttab_release_grant_reference(&np->gref_rx_head, ref);
 
 next:
-		if (m != NULL) {
-				m->m_len = rx->status;
-				m->m_data += rx->offset;
-				m0->m_pkthdr.len += rx->status;
-		}
+		if (m == NULL)
+			break;
+		
+		m->m_len = rx->status;
+		m->m_data += rx->offset;
+		m0->m_pkthdr.len += rx->status;
 		
 		if (!(rx->flags & NETRXF_more_data))
 			break;