From owner-svn-src-user@FreeBSD.ORG  Tue Dec 30 00:50:25 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 6BE231065680;
	Tue, 30 Dec 2008 00:50:25 +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 5CCC68FC18;
	Tue, 30 Dec 2008 00:50:25 +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 mBU0oPlC071403;
	Tue, 30 Dec 2008 00:50:25 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBU0oPKM071402;
	Tue, 30 Dec 2008 00:50:25 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812300050.mBU0oPKM071402@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 30 Dec 2008 00:50:25 +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: r186580 - 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:50:25 -0000

Author: kmacy
Date: Tue Dec 30 00:50:25 2008
New Revision: 186580
URL: http://svn.freebsd.org/changeset/base/186580

Log:
  don't check INP_WLOCKED if inp is NULL

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:19:06 2008	(r186579)
+++ user/kmacy/HEAD_fast_net/sys/netinet/ip_output.c	Tue Dec 30 00:50:25 2008	(r186580)
@@ -631,14 +631,15 @@ passout:
 
 done:
 	if (ro == &iproute && ro->ro_rt != NULL) {
-		int wlocked;		
+		int wlocked = 0;		
 		struct llentry *la;
 		
-		wlocked = INP_WLOCKED(inp);
-		if ((neednewlle || neednewroute) &&
-		    !wlocked && INP_TRY_UPGRADE(inp) == 0)
-			return (error);
-		
+		if (neednewlle || neednewroute) {
+			wlocked = INP_WLOCKED(inp);
+			if (!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) {