From owner-svn-src-user@FreeBSD.ORG  Tue Dec 30 00:19:07 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 26DE91065672;
	Tue, 30 Dec 2008 00:19:07 +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 178BD8FC0C;
	Tue, 30 Dec 2008 00:19:07 +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 mBU0J6ft070739;
	Tue, 30 Dec 2008 00:19:06 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBU0J6V3070738;
	Tue, 30 Dec 2008 00:19:06 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812300019.mBU0J6V3070738@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 30 Dec 2008 00:19:06 +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: r186579 - user/kmacy/HEAD_fast_net/sys/netinet
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: Tue, 30 Dec 2008 00:19:07 -0000

Author: kmacy
Date: Tue Dec 30 00:19:06 2008
New Revision: 186579
URL: http://svn.freebsd.org/changeset/base/186579

Log:
  cleanup upgrade / downgrade checks for route and lle

Modified:
  user/kmacy/HEAD_fast_net/sys/netinet/ip_output.c

Modified: user/kmacy/HEAD_fast_net/sys/netinet/ip_output.c
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/netinet/ip_output.c	Tue Dec 30 00:15:12 2008	(r186578)
+++ user/kmacy/HEAD_fast_net/sys/netinet/ip_output.c	Tue Dec 30 00:19:06 2008	(r186579)
@@ -635,18 +635,18 @@ done:
 		struct llentry *la;
 		
 		wlocked = INP_WLOCKED(inp);
+		if ((neednewlle || neednewroute) &&
+		    !wlocked && INP_TRY_UPGRADE(inp) == 0)
+			return (error);
+		
 		if (inp == NULL || (inp->inp_vflag & INP_RT_VALID) == 0)
 			RTFREE(ro->ro_rt);
 		else if (neednewroute && ro->ro_rt != inp->inp_rt) {
-			if (!wlocked && INP_TRY_UPGRADE(inp) == 0)
-				return (error);
 			RTFREE(inp->inp_rt);
 			inp->inp_rt = ro->ro_rt;
 
 		}
 		if (neednewlle) {
-			if (!wlocked && INP_TRY_UPGRADE(inp) == 0)
-				return (error);
 			IF_AFDATA_RLOCK(ifp);	
 			la = lla_lookup(LLTABLE(ifp), LLE_EXCLUSIVE,
 			    (struct sockaddr *)dst);
@@ -667,7 +667,7 @@ done:
 			} else if (la != NULL)
 				LLE_WUNLOCK(la);
 		}
-		if (!wlocked)
+		if ((neednewlle || neednewroute) && !wlocked)
 			INP_DOWNGRADE(inp);
 	}