From owner-p4-projects@FreeBSD.ORG  Tue Apr 28 12:03:27 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8788210658D0; Tue, 28 Apr 2009 12:03:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B048E10658CB
	for <perforce@freebsd.org>; Tue, 28 Apr 2009 12:03:23 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 950FE8FC1D
	for <perforce@freebsd.org>; Tue, 28 Apr 2009 12:03:23 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3SC3Nt1015475
	for <perforce@freebsd.org>; Tue, 28 Apr 2009 12:03:23 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3SC3NlQ015473
	for perforce@freebsd.org; Tue, 28 Apr 2009 12:03:23 GMT
	(envelope-from zec@fer.hr)
Date: Tue, 28 Apr 2009 12:03:23 GMT
Message-Id: <200904281203.n3SC3NlQ015473@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 161245 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: Tue, 28 Apr 2009 12:03:35 -0000

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

Change 161245 by zec@zec_amdx2 on 2009/04/28 12:02:57

	VIMAGE kernels work much better if curvnet is properly set
	before processing netisrs.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/net/netisr.c#3 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/net/netisr.c#3 (text+ko) ====

@@ -43,6 +43,7 @@
 #include <sys/resourcevar.h>
 #include <sys/sysctl.h>
 #include <sys/unistd.h>
+#include <sys/vimage.h>
 #include <machine/atomic.h>
 #include <machine/cpu.h>
 #include <machine/stdarg.h>
@@ -142,7 +143,10 @@
 		IF_DEQUEUE(ni->ni_queue, m);
 		if (m == NULL)
 			break;
+		VNET_ASSERT(m->m_pkthdr.rcvif != NULL);
+		CURVNET_SET(m->m_pkthdr.rcvif->if_vnet);
 		ni->ni_handler(m);
+		CURVNET_RESTORE();
 	}
 }