svn commit: r203468 - in user/kmacy/head_flowtable_v6/sys: net netinet

[Kip Macy]

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
 	}