From owner-p4-projects@FreeBSD.ORG  Thu Nov 27 13:50:48 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F3397106567A; Thu, 27 Nov 2008 13:50:47 +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 B721A1065670
	for <perforce@freebsd.org>; Thu, 27 Nov 2008 13:50:47 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A52D98FC1A
	for <perforce@freebsd.org>; Thu, 27 Nov 2008 13:50:47 +0000 (UTC)
	(envelope-from zec@tel.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 mARDolpk032124
	for <perforce@freebsd.org>; Thu, 27 Nov 2008 13:50:47 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mARDol7j032122
	for perforce@freebsd.org; Thu, 27 Nov 2008 13:50:47 GMT
	(envelope-from zec@tel.fer.hr)
Date: Thu, 27 Nov 2008 13:50:47 GMT
Message-Id: <200811271350.mARDol7j032122@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@tel.fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 153669 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: Thu, 27 Nov 2008 13:50:48 -0000

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

Change 153669 by zec@zec_tca51 on 2008/11/27 13:50:35

	Unbreak LINT and VLINT builds.

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_poll.c#14 edit
.. //depot/projects/vimage/src/sys/net/bpf.c#30 edit
.. //depot/projects/vimage/src/sys/netipsec/keysock.c#22 edit
.. //depot/projects/vimage/src/sys/netipsec/keysock.h#4 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/kern_poll.c#14 (text+ko) ====

@@ -37,6 +37,7 @@
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
+#include <sys/vimage.h>
 
 #include <net/if.h>			/* for IFF_* flags		*/
 #include <net/netisr.h>			/* for NETISR_POLL		*/
@@ -44,7 +45,6 @@
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/kthread.h>
-#include <sys/vimage.h>
 
 static void netisr_poll(void);		/* the two netisr handlers      */
 static void netisr_pollmore(void);

==== //depot/projects/vimage/src/sys/net/bpf.c#30 (text+ko) ====

@@ -873,21 +873,18 @@
 	m->m_len -= hlen;
 	m->m_data += hlen;	/* XXX */
 
+	CURVNET_SET(ifp->if_vnet);
 #ifdef MAC
 	BPFD_LOCK(d);
-	CURVNET_SET(ifp->if_vnet);
 	mac_bpfdesc_create_mbuf(d, m);
-	CURVNET_RESTORE();
 	if (mc != NULL)
 		mac_bpfdesc_create_mbuf(d, mc);
 	BPFD_UNLOCK(d);
 #endif
 
-	CURVNET_SET(ifp->if_vnet);
 	error = (*ifp->if_output)(ifp, m, &dst, NULL);
 	if (error)
 		d->bd_wdcount++;
-	CURVNET_RESTORE();
 
 	if (mc != NULL) {
 		if (error == 0)
@@ -895,6 +892,7 @@
 		else
 			m_freem(mc);
 	}
+	CURVNET_RESTORE();
 
 	return (error);
 }

==== //depot/projects/vimage/src/sys/netipsec/keysock.c#22 (text+ko) ====


==== //depot/projects/vimage/src/sys/netipsec/keysock.h#4 (text+ko) ====

@@ -58,12 +58,10 @@
 	u_quad_t sockerr;		/* # of socket related errors */
 };
 
-#ifdef VIMAGE
 struct key_cb {
 	int key_count;
 	int any_count;
 };
-#endif
 
 #define KEY_SENDUP_ONE		0
 #define KEY_SENDUP_ALL		1