From owner-svn-src-user@FreeBSD.ORG  Wed Dec 31 05:09:55 2008
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 1AA4C1065688;
	Wed, 31 Dec 2008 05:09:55 +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 09AB18FC1F;
	Wed, 31 Dec 2008 05:09:55 +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 mBV59rYJ015526;
	Wed, 31 Dec 2008 05:09:53 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBV59rDr015525;
	Wed, 31 Dec 2008 05:09:53 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812310509.mBV59rDr015525@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 31 Dec 2008 05:09:53 +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: r186630 - user/kmacy/HEAD_fast_net/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, 31 Dec 2008 05:09:55 -0000

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