From owner-svn-src-user@FreeBSD.ORG  Thu Feb  4 02:17:35 2010
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 884DA106566B;
	Thu,  4 Feb 2010 02:17:35 +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 7616C8FC0A;
	Thu,  4 Feb 2010 02:17:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o142HZiZ077503;
	Thu, 4 Feb 2010 02:17:35 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o142HZhF077500;
	Thu, 4 Feb 2010 02:17:35 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201002040217.o142HZhF077500@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 4 Feb 2010 02:17:35 +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: r203468 - in user/kmacy/head_flowtable_v6/sys: net
	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: Thu, 04 Feb 2010 02:17:35 -0000

Author: kmacy
Date: Thu Feb  4 02:17:35 2010
New Revision: 203468
URL: http://svn.freebsd.org/changeset/base/203468

Log:
  - initialize ro_dst in flowtable_lookup
  - set nortfree if we're not holding a local reference

Modified:
  user/kmacy/head_flowtable_v6/sys/net/flowtable.c
  user/kmacy/head_flowtable_v6/sys/netinet/ip_output.c

Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c
==============================================================================
--- user/kmacy/head_flowtable_v6/sys/net/flowtable.c	Thu Feb  4 01:07:28 2010	(r203467)
+++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c	Thu Feb  4 02:17:35 2010	(r203468)
@@ -955,6 +955,7 @@ flowtable_lookup(struct flowtable *ft, s
 	ro = &sro;
 	ro->ro_rt = NULL;
 	ro->ro_lle = NULL;
+	ro->ro_dst = *dsa;
 	hash = 0;
 	flags |= ft->ft_flags;
 #ifdef INET

Modified: user/kmacy/head_flowtable_v6/sys/netinet/ip_output.c
==============================================================================
--- user/kmacy/head_flowtable_v6/sys/netinet/ip_output.c	Thu Feb  4 01:07:28 2010	(r203467)
+++ user/kmacy/head_flowtable_v6/sys/netinet/ip_output.c	Thu Feb  4 02:17:35 2010	(r203468)
@@ -157,10 +157,10 @@ ip_output(struct mbuf *m, struct mbuf *o
 			 * longer than that long for the stability of ro_rt.  The
 			 * flow ID assignment must have happened before this point.
 			 */
-			if ((fle = flowtable_lookup_mbuf(V_ip_ft, m, AF_INET)) != NULL)
+			if ((fle = flowtable_lookup_mbuf(V_ip_ft, m, AF_INET)) != NULL) {
 				flow_to_route(fle, ro);
-			else
 				nortfree = 1;
+			}
 		}
 #endif
 	}