From owner-svn-src-user@FreeBSD.ORG  Thu Nov  6 04:51:09 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 C17651065677;
	Thu,  6 Nov 2008 04:51:09 +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 B03458FC16;
	Thu,  6 Nov 2008 04:51:09 +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 mA64p93M045694;
	Thu, 6 Nov 2008 04:51:09 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA64p9e1045693;
	Thu, 6 Nov 2008 04:51:09 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811060451.mA64p9e1045693@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 6 Nov 2008 04:51:09 +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: r184705 - user/kmacy/HEAD_multi_tx/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: Thu, 06 Nov 2008 04:51:09 -0000

Author: kmacy
Date: Thu Nov  6 04:51:09 2008
New Revision: 184705
URL: http://svn.freebsd.org/changeset/base/184705

Log:
  although the rt should never be NULL if the hash is set ... check that rt is set

Modified:
  user/kmacy/HEAD_multi_tx/sys/net/flowtable.c

Modified: user/kmacy/HEAD_multi_tx/sys/net/flowtable.c
==============================================================================
--- user/kmacy/HEAD_multi_tx/sys/net/flowtable.c	Thu Nov  6 02:41:08 2008	(r184704)
+++ user/kmacy/HEAD_multi_tx/sys/net/flowtable.c	Thu Nov  6 04:51:09 2008	(r184705)
@@ -441,6 +441,7 @@ flow_stale(struct flowtable *ft, struct 
 	time_t idle_time;
 
 	if ((fle->f_fhash == 0)
+	    || (fle->f_rt == NULL)
 	    || ((fle->f_rt->rt_flags & RTF_UP) == 0)
 	    || (fle->f_uptime <= fle->f_rt->rt_llinfo_uptime)
 	    || ((fle->f_rt->rt_flags & RTF_GATEWAY) &&
@@ -506,7 +507,8 @@ retry:	
 		FL_ENTRY_UNLOCK(ft, hash);
 		if (!stale)
 			return (ENOSPC);
-		RTFREE(rt0);
+		if (rt0)
+			RTFREE(rt0);
 		/*
 		 * We might end up on a different cpu
 		 */