From owner-svn-src-user@FreeBSD.ORG  Wed Jul  1 00:07:56 2009
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 7B76A1065670;
	Wed,  1 Jul 2009 00:07:56 +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 6A6188FC08;
	Wed,  1 Jul 2009 00:07:56 +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 n6107uTc095884;
	Wed, 1 Jul 2009 00:07:56 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6107u40095882;
	Wed, 1 Jul 2009 00:07:56 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200907010007.n6107u40095882@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 1 Jul 2009 00:07:56 +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: r195218 - user/kmacy/head_ppacket/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: Wed, 01 Jul 2009 00:07:56 -0000

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) {