From owner-p4-projects@FreeBSD.ORG  Sun Apr 26 22:49:11 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C8AD31065672; Sun, 26 Apr 2009 22:49:10 +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 88AB2106564A
	for <perforce@freebsd.org>; Sun, 26 Apr 2009 22:49:10 +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 764E98FC2B
	for <perforce@freebsd.org>; Sun, 26 Apr 2009 22:49:10 +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 n3QMnAlh063353
	for <perforce@freebsd.org>; Sun, 26 Apr 2009 22:49:10 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3QMnA59063351
	for perforce@freebsd.org; Sun, 26 Apr 2009 22:49:10 GMT
	(envelope-from zec@fer.hr)
Date: Sun, 26 Apr 2009 22:49:10 GMT
Message-Id: <200904262249.n3QMnA59063351@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 161153 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: Sun, 26 Apr 2009 22:49:11 -0000

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

Change 161153 by zec@zec_amdx2 on 2009/04/26 22:48:24

	Unbreak options VIMAGE kernel build.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/net/if.c#48 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#14 edit

Differences ...

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

@@ -546,6 +546,7 @@
 static void
 if_free_internal(struct ifnet *ifp)
 {
+	INIT_VNET_NET(ifp->if_vnet);
 
 	KASSERT((ifp->if_flags & IFF_DYING),
 	    ("if_free_internal: interface not dying"));
@@ -583,7 +584,6 @@
 void
 if_free_type(struct ifnet *ifp, u_char type)
 {
-	INIT_VNET_NET(curvnet); /* ifp->if_vnet can be NULL here ! */
 
 	KASSERT(ifp->if_alloctype == type,
 	    ("if_free_type: type (%d) != alloctype (%d)", type,

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

@@ -77,7 +77,6 @@
 static int
 sysctl_ifdata(SYSCTL_HANDLER_ARGS) /* XXX bad syntax! */
 {
-	INIT_VNET_NET(curvnet);
 	int *name = (int *)arg1;
 	int error;
 	u_int namelen = arg2;