From owner-svn-src-user@FreeBSD.ORG  Tue Oct 28 08:21:42 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 A9F881065673;
	Tue, 28 Oct 2008 08:21:42 +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 66F2F8FC1C;
	Tue, 28 Oct 2008 08:21:42 +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 m9S8Lgs7087429;
	Tue, 28 Oct 2008 08:21:42 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9S8Lgfp087428;
	Tue, 28 Oct 2008 08:21:42 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200810280821.m9S8Lgfp087428@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 28 Oct 2008 08:21:42 +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: r184398 - user/kmacy/HEAD_fast_xmit/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: Tue, 28 Oct 2008 08:21:42 -0000

Author: kmacy
Date: Tue Oct 28 08:21:41 2008
New Revision: 184398
URL: http://svn.freebsd.org/changeset/base/184398

Log:
  - fix index generation from hash
  - set ro.ro_rt before passing ro to route_to_rtentry_info

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

Modified: user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c
==============================================================================
--- user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c	Tue Oct 28 07:37:02 2008	(r184397)
+++ user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c	Tue Oct 28 08:21:41 2008	(r184398)
@@ -403,7 +403,7 @@ static struct flentry *
 flowtable_entry(struct flowtable *ft, uint32_t hash)
 {
 	struct flentry *fle;
-	int index = (ft->ft_size % hash);
+	int index = (hash % ft->ft_size);
  
 	if ((ft->ft_flags & FL_IPV6) == 0) {
 		if (ft->ft_flags & FL_PCPU)
@@ -603,6 +603,7 @@ flowtable_lookup(struct flowtable *ft, s
 		fle->f_uptime = time_uptime;
 		fle->f_flags |= flags;
 		fle->f_rt->rt_rmx.rmx_pksent++;
+		ro.ro_rt = fle->f_rt;
 		route_to_rtentry_info(&ro, fle->f_desten, ri);
 		FL_ENTRY_UNLOCK(ft, hash);
 		return (0);