From owner-svn-src-user@FreeBSD.ORG  Tue Oct 28 21:04:37 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 944311065694;
	Tue, 28 Oct 2008 21:04:37 +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 828008FE53;
	Tue, 28 Oct 2008 21:04:37 +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 m9SL4btH003900;
	Tue, 28 Oct 2008 21:04:37 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9SL4bV2003898;
	Tue, 28 Oct 2008 21:04:37 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200810282104.m9SL4bV2003898@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 28 Oct 2008 21:04:37 +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: r184423 - user/kmacy/HEAD_fast_xmit/sys/net
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: Tue, 28 Oct 2008 21:04:37 -0000

Author: kmacy
Date: Tue Oct 28 21:04:37 2008
New Revision: 184423
URL: http://svn.freebsd.org/changeset/base/184423

Log:
  fix flowtable and route build when RADIX_MPATH is enabled

Modified:
  user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c
  user/kmacy/HEAD_fast_xmit/sys/net/route.c

Modified: user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c
==============================================================================
--- user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c	Tue Oct 28 19:52:56 2008	(r184422)
+++ user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c	Tue Oct 28 21:04:37 2008	(r184423)
@@ -272,12 +272,14 @@ struct flowtable {
 static uint32_t hashjitter;
 static int	flowtable_disable;
 
+#ifndef RADIX_MPATH
 static void
 in_rtalloc_ign_wrapper(struct route *ro, uint32_t hash, u_int fib)
 {
 
 	in_rtalloc_ign(ro, 0, fib);
 }
+#endif
 
 static void
 flowtable_global_lock(struct flowtable *table, uint32_t hash)

Modified: user/kmacy/HEAD_fast_xmit/sys/net/route.c
==============================================================================
--- user/kmacy/HEAD_fast_xmit/sys/net/route.c	Tue Oct 28 19:52:56 2008	(r184422)
+++ user/kmacy/HEAD_fast_xmit/sys/net/route.c	Tue Oct 28 21:04:37 2008	(r184423)
@@ -809,9 +809,6 @@ rtexpunge(struct rtentry *rt)
 	KASSERT(rt == RNTORT(rn),
 		("lookup mismatch, rt %p rn %p", rt, rn));
 	rt->rt_flags &= ~RTF_UP;
-#ifdef RADIX_MPATH
-	ipv4_flow_free_all(rt);
-#endif
 
 	/*
 	 * Now search what's left of the subtree for any cloned
@@ -950,9 +947,6 @@ rtrequest1_fib(int req, struct rt_addrin
 			RT_LOCK(rt);
 			RT_ADDREF(rt);
 			rt->rt_flags &= ~RTF_UP;
-#ifdef RADIX_MPATH
-			ipv4_flow_free_all(rt);
-#endif
 			goto deldone;  /* done with the RTM_DELETE command */
 		}
 
@@ -971,9 +965,6 @@ normal_rtdel:
 		RT_LOCK(rt);
 		RT_ADDREF(rt);
 		rt->rt_flags &= ~RTF_UP;
-#ifdef RADIX_MPATH
-		ipv4_flow_free_all(rt);
-#endif	
 		/*
 		 * Now search what's left of the subtree for any cloned
 		 * routes which might have been formed from this node.