svn commit: r195218 - user/kmacy/head_ppacket/sys/net

[Kip Macy]

Author: kmacy
Date: Wed Jul  1 00:07:55 2009
New Revision: 195218
URL: http://svn.freebsd.org/changeset/base/195218

Log:
  skip to delete

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

Modified: user/kmacy/head_ppacket/sys/net/route.c
==============================================================================
--- user/kmacy/head_ppacket/sys/net/route.c	Tue Jun 30 22:59:38 2009	(r195217)
+++ user/kmacy/head_ppacket/sys/net/route.c	Wed Jul  1 00:07:55 2009	(r195218)
@@ -988,11 +988,9 @@ rn_mpath_update(int req, struct rt_addri
 				memcmp(rt->rt_gateway, gateway, gateway->sa_len)))
 				error = ESRCH;
 			else {
-				RT_LOCK(rt);
-				*ret_nrt = rt;
-				RT_ADDREF(rt);
-				RT_UNLOCK(rt);
-				goto done;
+				rn = rnh->rnh_deladdr(dst, netmask, rnh);
+				KASSERT(rn != NULL, ("radix node disappeared"));
+				goto gwdelete;
 			}
 			
 		}
@@ -1006,12 +1004,12 @@ rn_mpath_update(int req, struct rt_addri
 		error = ENOENT;
 		goto done;
 	}
-		
 	/*
 	 * if the entry is 2nd and on up
 	 */
 	if ((req == RTM_DELETE) && !rt_mpath_deldup(rto, rt))
 		panic ("rtrequest1: rt_mpath_deldup");
+gwdelete:
 	RT_LOCK(rt);
 	RT_ADDREF(rt);
 	if (req == RTM_DELETE) {