From owner-p4-projects@FreeBSD.ORG  Fri Jul 25 06:30: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 BF9CD1065676; Fri, 25 Jul 2008 06:30:48 +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 83C3E1065671
	for <perforce@freebsd.org>; Fri, 25 Jul 2008 06:30:48 +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 65F9B8FC0C
	for <perforce@freebsd.org>; Fri, 25 Jul 2008 06:30:48 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m6P6UmuL006226
	for <perforce@freebsd.org>; Fri, 25 Jul 2008 06:30:48 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6P6Umm3006224
	for perforce@freebsd.org; Fri, 25 Jul 2008 06:30:48 GMT
	(envelope-from zec@tel.fer.hr)
Date: Fri, 25 Jul 2008 06:30:48 GMT
Message-Id: <200807250630.m6P6Umm3006224@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 145870 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: Fri, 25 Jul 2008 06:30:49 -0000

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

Change 145870 by zec@zec_tpx32 on 2008/07/25 06:30:07

	Unbreak VIMAGE build.

Affected files ...

.. //depot/projects/vimage-devel/src/sys/netinet/tcp_offload.c#3 edit

Differences ...

==== //depot/projects/vimage-devel/src/sys/netinet/tcp_offload.c#3 (text+ko) ====

@@ -28,6 +28,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/netinet/tcp_offload.c,v 1.4 2008/07/21 21:22:56 kmacy Exp $");
 
+#include "opt_vimage.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -37,11 +39,13 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_var.h>
 
+#include <netinet/vinet.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_pcb.h>
@@ -101,21 +105,23 @@
 void
 tcp_offload_twstart(struct tcpcb *tp)
 {
+	INIT_VNET_INET(curvnet);
 
-	INP_INFO_WLOCK(&tcbinfo);
+	INP_INFO_WLOCK(&V_tcbinfo);
 	INP_WLOCK(tp->t_inpcb);
 	tcp_twstart(tp);
-	INP_INFO_WUNLOCK(&tcbinfo);
+	INP_INFO_WUNLOCK(&V_tcbinfo);
 }
 
 struct tcpcb *
 tcp_offload_close(struct tcpcb *tp)
 {
+	INIT_VNET_INET(curvnet);
 	
-	INP_INFO_WLOCK(&tcbinfo);
+	INP_INFO_WLOCK(&V_tcbinfo);
 	INP_WLOCK(tp->t_inpcb);
 	tp = tcp_close(tp);
-	INP_INFO_WUNLOCK(&tcbinfo);
+	INP_INFO_WUNLOCK(&V_tcbinfo);
 	if (tp)
 		INP_WUNLOCK(tp->t_inpcb);
 
@@ -125,11 +131,12 @@
 struct tcpcb *
 tcp_offload_drop(struct tcpcb *tp, int error)
 {
+	INIT_VNET_INET(curvnet);
 	
-	INP_INFO_WLOCK(&tcbinfo);
+	INP_INFO_WLOCK(&V_tcbinfo);
 	INP_WLOCK(tp->t_inpcb);
 	tp = tcp_drop(tp, error);
-	INP_INFO_WUNLOCK(&tcbinfo);
+	INP_INFO_WUNLOCK(&V_tcbinfo);
 	if (tp)
 		INP_WUNLOCK(tp->t_inpcb);