svn commit: r186630 - user/kmacy/HEAD_fast_net/sys/net

[Kip Macy]

Author: kmacy
Date: Wed Dec 31 05:09:53 2008
New Revision: 186630
URL: http://svn.freebsd.org/changeset/base/186630

Log:
  fix route shutdown merge

Modified:
  user/kmacy/HEAD_fast_net/sys/net/route.c

Modified: user/kmacy/HEAD_fast_net/sys/net/route.c
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/net/route.c	Wed Dec 31 04:56:17 2008	(r186629)
+++ user/kmacy/HEAD_fast_net/sys/net/route.c	Wed Dec 31 05:09:53 2008	(r186630)
@@ -812,7 +812,8 @@ rn_mpath_delete(int req, struct rt_addri
 	 * if we got multipath routes, we require users to specify
 	 * a matching RTAX_GATEWAY.
 	 */
-	struct rtentry *rto = NULL;
+	struct rtentry *rt, *rto = NULL;
+	register struct radix_node *rn;
 	int error = 0;
 
 	rn = rnh->rnh_matchaddr(dst, rnh);
@@ -820,7 +821,7 @@ rn_mpath_delete(int req, struct rt_addri
 		return (ESRCH);
 	rto = rt = RNTORT(rn);
 	rt = rt_mpath_matchgate(rt, gateway);
-	if (!rt)
+	if (rt == NULL)
 		return (ESRCH);
 	/*
 	 * this is the first entry in the chain