svn commit: r184423 - user/kmacy/HEAD_fast_xmit/sys/net
Kip Macy
kmacy at FreeBSD.org
Tue Oct 28 21:04:37 UTC 2008
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.
More information about the svn-src-user
mailing list