From owner-svn-src-all@FreeBSD.ORG Tue Sep 20 20:27:26 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89B941065672; Tue, 20 Sep 2011 20:27:26 +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 6070B8FC15; Tue, 20 Sep 2011 20:27:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8KKRQMW043404; Tue, 20 Sep 2011 20:27:26 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8KKRQfQ043399; Tue, 20 Sep 2011 20:27:26 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201109202027.p8KKRQfQ043399@svn.freebsd.org> From: Kip Macy Date: Tue, 20 Sep 2011 20:27:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225698 - in head/sys: net netinet6 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Sep 2011 20:27:26 -0000 Author: kmacy Date: Tue Sep 20 20:27:26 2011 New Revision: 225698 URL: http://svn.freebsd.org/changeset/base/225698 Log: Make KBI changes required for future MFCing of inpcb rtentry / llentry caching. Reviewed by: rwatson, bz Approved by: re (kib) Modified: head/sys/net/if_llatbl.h head/sys/net/radix.h head/sys/net/route.h head/sys/netinet6/in6.h Modified: head/sys/net/if_llatbl.h ============================================================================== --- head/sys/net/if_llatbl.h Tue Sep 20 19:07:56 2011 (r225697) +++ head/sys/net/if_llatbl.h Tue Sep 20 20:27:26 2011 (r225698) @@ -59,6 +59,7 @@ struct llentry { struct rwlock lle_lock; struct lltable *lle_tbl; struct llentries *lle_head; + void (*lle_free)(struct lltable *, struct llentry *); struct mbuf *la_hold; int la_numheld; /* # of packets currently held */ time_t la_expire; Modified: head/sys/net/radix.h ============================================================================== --- head/sys/net/radix.h Tue Sep 20 19:07:56 2011 (r225697) +++ head/sys/net/radix.h Tue Sep 20 20:27:26 2011 (r225698) @@ -105,6 +105,8 @@ typedef int walktree_f_t(struct radix_no struct radix_node_head { struct radix_node *rnh_treetop; + u_int rnh_gen; /* generation counter */ + int rnh_multipath; /* multipath capable ? */ int rnh_addrsize; /* permit, but not require fixed keys */ int rnh_pktsize; /* permit, but not require fixed keys */ struct radix_node *(*rnh_addaddr) /* add based on sockaddr */ @@ -131,8 +133,6 @@ struct radix_node_head { void (*rnh_close) /* do something when the last ref drops */ (struct radix_node *rn, struct radix_node_head *head); struct radix_node rnh_nodes[3]; /* empty tree for common case */ - int rnh_multipath; /* multipath capable ? */ - u_int rnh_spare; /* route caching */ #ifdef _KERNEL struct rwlock rnh_lock; /* locks entire radix tree */ #endif Modified: head/sys/net/route.h ============================================================================== --- head/sys/net/route.h Tue Sep 20 19:07:56 2011 (r225697) +++ head/sys/net/route.h Tue Sep 20 20:27:26 2011 (r225698) @@ -49,9 +49,13 @@ struct route { struct rtentry *ro_rt; struct llentry *ro_lle; + struct in_ifaddr *ro_ia; + int ro_flags; struct sockaddr ro_dst; }; +#define RT_CACHING_CONTEXT 0x1 + /* * These numbers are used by reliable protocols for determining * retransmission behavior and are included in the routing structure. Modified: head/sys/netinet6/in6.h ============================================================================== --- head/sys/netinet6/in6.h Tue Sep 20 19:07:56 2011 (r225697) +++ head/sys/netinet6/in6.h Tue Sep 20 20:27:26 2011 (r225698) @@ -376,6 +376,8 @@ extern const struct in6_addr in6addr_lin struct route_in6 { struct rtentry *ro_rt; struct llentry *ro_lle; + struct in6_addr *ro_ia6; + int ro_flags; struct sockaddr_in6 ro_dst; }; #endif