From owner-svn-src-head@FreeBSD.ORG  Tue Nov 11 09:40:28 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 56A581065672;
	Tue, 11 Nov 2008 09:40:28 +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 2AD5A8FC0C;
	Tue, 11 Nov 2008 09:40:28 +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 mAB9eS65096380;
	Tue, 11 Nov 2008 09:40:28 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAB9eS23096379;
	Tue, 11 Nov 2008 09:40:28 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811110940.mAB9eS23096379@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 11 Nov 2008 09:40:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184837 - head/sys/net
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Nov 2008 09:40:28 -0000

Author: kmacy
Date: Tue Nov 11 09:40:27 2008
New Revision: 184837
URL: http://svn.freebsd.org/changeset/base/184837

Log:
  - Use RTFREE_LOCKED macro
  - Don't clone route on lookup (was causing arpresolve to fail)
  - u_int_32 -> uint32_t
  
  Reviewed by:	qingli
  MFC after:	3 days

Modified:
  head/sys/net/radix_mpath.c

Modified: head/sys/net/radix_mpath.c
==============================================================================
--- head/sys/net/radix_mpath.c	Tue Nov 11 08:42:59 2008	(r184836)
+++ head/sys/net/radix_mpath.c	Tue Nov 11 09:40:27 2008	(r184837)
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 /*
  * give some jitter to hash, to avoid synchronization between routers
  */
-static u_int32_t hashjitter;
+static uint32_t hashjitter;
 
 int
 rn_mpath_capable(struct radix_node_head *rnh)
@@ -267,7 +267,7 @@ rtalloc_mpath_fib(struct route *ro, u_in
 	 */
 	if (ro->ro_rt && ro->ro_rt->rt_ifp && (ro->ro_rt->rt_flags & RTF_UP))
 		return;				 /* XXX */
-	ro->ro_rt = rtalloc1_fib(&ro->ro_dst, 1, 0UL, fibnum);
+	ro->ro_rt = rtalloc1_fib(&ro->ro_dst, 1, RTF_CLONING, fibnum);
 
 	/* if the route does not exist or it is not multipath, don't care */
 	if (ro->ro_rt == NULL)
@@ -299,7 +299,7 @@ rtalloc_mpath_fib(struct route *ro, u_in
 		return;
 	}
 	
-	rtfree(ro->ro_rt);
+	RTFREE_LOCKED(ro->ro_rt);
 	ro->ro_rt = (struct rtentry *)rn;
 	RT_LOCK(ro->ro_rt);
 	RT_ADDREF(ro->ro_rt);