From owner-svn-src-user@FreeBSD.ORG  Mon Dec 29 22:36:24 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7B9081065673;
	Mon, 29 Dec 2008 22:36:24 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 68A068FC29;
	Mon, 29 Dec 2008 22:36:24 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBTMaOXG068759;
	Mon, 29 Dec 2008 22:36:24 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBTMaOuS068756;
	Mon, 29 Dec 2008 22:36:24 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812292236.mBTMaOuS068756@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 29 Dec 2008 22:36:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186575 - user/kmacy/HEAD_fast_net/sys/netinet
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Dec 2008 22:36:25 -0000

Author: kmacy
Date: Mon Dec 29 22:36:23 2008
New Revision: 186575
URL: http://svn.freebsd.org/changeset/base/186575

Log:
  - add cached llentry to inpcb
  - reduce header pollution by removing net/route.h include from in_pcb.h

Modified:
  user/kmacy/HEAD_fast_net/sys/netinet/in_pcb.h
  user/kmacy/HEAD_fast_net/sys/netinet/tcp_hostcache.c
  user/kmacy/HEAD_fast_net/sys/netinet/tcp_offload.c

Modified: user/kmacy/HEAD_fast_net/sys/netinet/in_pcb.h
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/netinet/in_pcb.h	Mon Dec 29 22:30:08 2008	(r186574)
+++ user/kmacy/HEAD_fast_net/sys/netinet/in_pcb.h	Mon Dec 29 22:36:23 2008	(r186575)
@@ -39,8 +39,6 @@
 #include <sys/_mutex.h>
 #include <sys/_rwlock.h>
 
-#include <net/route.h>
-
 #ifdef _KERNEL
 #include <sys/rwlock.h>
 #endif
@@ -49,6 +47,10 @@
 #define	in6p_sp		inp_sp	/* for KAME src sync over BSD*'s */
 struct inpcbpolicy;
 
+struct rtentry;
+struct llentry;
+struct route;
+
 /*
  * struct inpcb is the common protocol control block structure used in most
  * IP transport protocols.
@@ -169,8 +171,8 @@ struct inpcb {
 	u_char	inp_ip_minttl;		/* (i) minimum TTL or drop */
 	uint32_t inp_ispare1;		/* (x) connection id / queue id */
 	u_int	inp_refcount;		/* (i) refcount */
-	void	*inp_pspare[1];		/* L2 information */
-	struct rtentry *inp_rt;		/* L3 information */
+	struct llentry	*inp_lle;	/* L2 information */
+	struct rtentry	*inp_rt;	/* L3 information */
 
 	/* Local and foreign ports, local and foreign addr. */
 	struct	in_conninfo inp_inc;	/* (i/p) list for PCB's local port */

Modified: user/kmacy/HEAD_fast_net/sys/netinet/tcp_hostcache.c
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/netinet/tcp_hostcache.c	Mon Dec 29 22:30:08 2008	(r186574)
+++ user/kmacy/HEAD_fast_net/sys/netinet/tcp_hostcache.c	Mon Dec 29 22:36:23 2008	(r186575)
@@ -79,6 +79,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/vimage.h>
 
 #include <net/if.h>
+#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>

Modified: user/kmacy/HEAD_fast_net/sys/netinet/tcp_offload.c
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/netinet/tcp_offload.c	Mon Dec 29 22:30:08 2008	(r186574)
+++ user/kmacy/HEAD_fast_net/sys/netinet/tcp_offload.c	Mon Dec 29 22:36:23 2008	(r186575)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_var.h>
+#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>