From owner-p4-projects@FreeBSD.ORG  Wed Jan  4 22:16:24 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0F03B16A423; Wed,  4 Jan 2006 22:16:24 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DAE9616A41F
	for <perforce@freebsd.org>; Wed,  4 Jan 2006 22:16:23 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D564343D5A
	for <perforce@freebsd.org>; Wed,  4 Jan 2006 22:16:14 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k04MGE5V035766
	for <perforce@freebsd.org>; Wed, 4 Jan 2006 22:16:14 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k04MGE5G035763
	for perforce@freebsd.org; Wed, 4 Jan 2006 22:16:14 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 4 Jan 2006 22:16:14 GMT
Message-Id: <200601042216.k04MGE5G035763@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 89185 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jan 2006 22:16:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=89185

Change 89185 by kmacy@kmacy:freebsd7_xen3 on 2006/01/04 22:15:54

	fix the network rx path, mbufs were not being set by allocated id

Affected files ...

.. //depot/projects/xen3/src/sys/dev/xen/netfront/netfront.c#2 edit

Differences ...

==== //depot/projects/xen3/src/sys/dev/xen/netfront/netfront.c#2 (text+ko) ====

@@ -284,11 +284,11 @@
 };
 #endif
 #define IPRINTK(fmt, args...) \
-    printk("[XEN] " fmt, ##args)
+    printf("[XEN] " fmt, ##args)
 #define WPRINTK(fmt, args...) \
-    printk("[XEN] " fmt, ##args)
+    printf("[XEN] " fmt, ##args)
 #define DPRINTK(fmt, args...) \
-    printk("[XEN] " fmt, ##args)
+    printf("[XEN] " fmt, ##args)
 
 static __inline struct mbuf* 
 makembuf (struct mbuf *buf)
@@ -619,7 +619,7 @@
 	 * ourself and for other kernel subsystems.
 	 */
 	batch_target = sc->rx_target - (req_prod - sc->rx.rsp_cons);
-	for ( i = sc->xn_rx_batchlen; i < batch_target; i++, sc->xn_rx_batchlen++) {
+	for (i = sc->xn_rx_batchlen; i < batch_target; i++, sc->xn_rx_batchlen++) {
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) 
 			break;
@@ -654,10 +654,10 @@
 		
 		id = GET_ID_FROM_FREELIST(sc->xn_rx_free_idxs);
 		KASSERT(id != 0, ("alloc_rx_buffers: found free receive index of 0\n"));
-		sc->xn_cdata.xn_rx_chain[i] = m_new;
+		sc->xn_cdata.xn_rx_chain[id] = m_new;
 		
 		
-		RING_GET_REQUEST(&sc->rx, req_prod + i)->id = id;
+		RING_GET_REQUEST(&sc->rx, req_prod + i)->id = id;		
 		ref = gnttab_claim_grant_reference(&sc->gref_rx_head);
 		PANIC_IF((signed short)ref < 0);
 		sc->grant_rx_ref[id] = ref;
@@ -888,6 +888,7 @@
 			id = RING_GET_RESPONSE(&np->tx, i)->id;
 			m = np->xn_cdata.xn_tx_chain[id]; 
 			
+			ifp->if_opackets++;
 			KASSERT(m != NULL, ("mbuf not found in xn_tx_chain"));
 			M_ASSERTVALID(m);
 			if (unlikely(gnttab_query_foreign_access(