From owner-p4-projects@FreeBSD.ORG  Thu Nov 27 09:58:49 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 737451065677; Thu, 27 Nov 2008 09:58:49 +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 376AE1065672
	for <perforce@freebsd.org>; Thu, 27 Nov 2008 09:58:49 +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 2A4D68FC0A
	for <perforce@freebsd.org>; Thu, 27 Nov 2008 09:58:49 +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 mAR9wn4b000514
	for <perforce@freebsd.org>; Thu, 27 Nov 2008 09:58:49 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAR9wmCB000510
	for perforce@freebsd.org; Thu, 27 Nov 2008 09:58:48 GMT
	(envelope-from zec@tel.fer.hr)
Date: Thu, 27 Nov 2008 09:58:48 GMT
Message-Id: <200811270958.mAR9wmCB000510@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 153661 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 09:58:49 -0000

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

Change 153661 by zec@zec_tca51 on 2008/11/27 09:58:05

	Unbreak build, and remove redundant #include <vimage.h> lines

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_poll.c#13 edit
.. //depot/projects/vimage/src/sys/kern/kern_synch.c#26 edit
.. //depot/projects/vimage/src/sys/kern/kern_thread.c#20 edit
.. //depot/projects/vimage/src/sys/kern/tty.c#27 edit
.. //depot/projects/vimage/src/sys/net/if_loop.c#33 edit
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#15 edit
.. //depot/projects/vimage/src/sys/netinet/ip_carp.c#16 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#63 edit
.. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#29 edit

Differences ...

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

@@ -37,7 +37,6 @@
 #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		*/

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

@@ -62,7 +62,6 @@
 #include <sys/uio.h>
 #include <sys/ktrace.h>
 #endif
-#include <sys/vimage.h>
 
 #include <machine/cpu.h>
 

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

@@ -47,7 +47,6 @@
 #include <sys/ktr.h>
 #include <sys/umtx.h>
 #include <sys/cpuset.h>
-#include <sys/vimage.h>
 
 #include <security/audit/audit.h>
 

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

@@ -60,7 +60,6 @@
 #include <sys/ttydefaults.h>
 #undef TTYDEFCHARS
 #include <sys/ucred.h>
-#include <sys/vimage.h>
 #include <sys/vnode.h>
 
 #include <machine/stdarg.h>

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

@@ -223,7 +223,6 @@
 static int
 loop_modevent(module_t mod, int type, void *data)
 {
-	INIT_VNET_NET(curvnet);
 
 	switch (type) {
 	case MOD_LOAD:

==== //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#15 (text+ko) ====

@@ -42,7 +42,6 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
-#include <sys/vimage.h>
  
 #include <net/if.h>
 #include <net/if_dl.h>

==== //depot/projects/vimage/src/sys/netinet/ip_carp.c#16 (text+ko) ====

@@ -49,7 +49,6 @@
 #include <sys/signalvar.h>
 #include <sys/filio.h>
 #include <sys/sockio.h>
-#include <sys/vimage.h>
 
 #include <sys/socket.h>
 #include <sys/vnode.h>

==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#63 (text+ko) ====

@@ -124,8 +124,8 @@
 static int	tcp_inflight_min;
 static int	tcp_inflight_max;
 static int	tcp_inflight_stab;
+static int	tcp_inflight_rttthresh;
 #endif
-static int	tcp_inflight_rttthresh;
 
 static int
 sysctl_net_inet_tcp_mss_check(SYSCTL_HANDLER_ARGS)

==== //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#29 (text+ko) ====

@@ -65,7 +65,6 @@
 unsigned long in6_maxmtu;
 int ip6_auto_linklocal;
 struct callout in6_tmpaddrtimer_ch;
-#endif
 extern struct inpcbinfo ripcbinfo;
 #endif