From owner-svn-src-head@FreeBSD.ORG  Mon May 18 04:56:37 2009
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 5834210656A9;
	Mon, 18 May 2009 04:56:37 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 469538FC08;
	Mon, 18 May 2009 04:56:37 +0000 (UTC)
	(envelope-from adrian@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 n4I4ubug050058;
	Mon, 18 May 2009 04:56:37 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4I4ub60050057;
	Mon, 18 May 2009 04:56:37 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <200905180456.n4I4ub60050057@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 18 May 2009 04:56:37 +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: r192286 - head/sys/dev/xen/netfront
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: Mon, 18 May 2009 04:56:38 -0000

Author: adrian
Date: Mon May 18 04:56:37 2009
New Revision: 192286
URL: http://svn.freebsd.org/changeset/base/192286

Log:
  The merge in r189699 reverted part of the work done in a previous commit
  (r188036.)
  
  Re-revert that change so the Xen networking functions again.

Modified:
  head/sys/dev/xen/netfront/netfront.c

Modified: head/sys/dev/xen/netfront/netfront.c
==============================================================================
--- head/sys/dev/xen/netfront/netfront.c	Mon May 18 04:50:31 2009	(r192285)
+++ head/sys/dev/xen/netfront/netfront.c	Mon May 18 04:56:37 2009	(r192286)
@@ -1297,11 +1297,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;