svn commit: r192286 - head/sys/dev/xen/netfront

[Adrian Chadd]

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;