From owner-svn-src-user@FreeBSD.ORG  Wed Jul  1 19:46:54 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 4D50D106566C;
	Wed,  1 Jul 2009 19:46:54 +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 3C1768FC15;
	Wed,  1 Jul 2009 19:46:54 +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 n61Jks4A022061;
	Wed, 1 Jul 2009 19:46:54 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n61JkswS022059;
	Wed, 1 Jul 2009 19:46:54 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200907011946.n61JkswS022059@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 1 Jul 2009 19:46:54 +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: r195253 - 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 19:46:54 -0000

Author: kmacy
Date: Wed Jul  1 19:46:53 2009
New Revision: 195253
URL: http://svn.freebsd.org/changeset/base/195253

Log:
  add comment, firm up assert

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	Wed Jul  1 18:54:49 2009	(r195252)
+++ user/kmacy/head_ppacket/sys/net/route.c	Wed Jul  1 19:46:53 2009	(r195253)
@@ -988,8 +988,12 @@ rn_mpath_update(int req, struct rt_addri
 				memcmp(rt->rt_gateway, gateway, gateway->sa_len)))
 				error = ESRCH;
 			else {
+				/*
+				 * remove from tree before returning it
+				 * to the caller
+				 */
 				rn = rnh->rnh_deladdr(dst, netmask, rnh);
-				KASSERT(rn != NULL, ("radix node disappeared"));
+				KASSERT(rt == RNTORT(rn), ("radix node disappeared"));
 				goto gwdelete;
 			}