[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

[zrouter-src-freebsd at zrouter.org]

details:   http://zrouter.org/hg/FreeBSD/head//rev/1b729d3573af
changeset: 313:1b729d3573af
user:      ray at terran.dlink.ua
date:      Wed Feb 01 11:33:08 2012 +0200
description:
Update sys/net

diffstat:

 head/sys/net/flowtable.c |   6 ++++--
 head/sys/net/if_llatbl.c |   3 ++-
 head/sys/net/route.c     |  10 +++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diffs (75 lines):

diff -r 32d481af6f40 -r 1b729d3573af head/sys/net/flowtable.c
--- a/head/sys/net/flowtable.c	Wed Feb 01 11:32:57 2012 +0200
+++ b/head/sys/net/flowtable.c	Wed Feb 01 11:33:08 2012 +0200
@@ -34,7 +34,7 @@
 #include "opt_inet6.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/net/flowtable.c 227309 2011-11-07 15:43:11Z ed $");
+__FBSDID("$FreeBSD: head/sys/net/flowtable.c 230598 2012-01-26 20:02:40Z kmacy $");
 
 #include <sys/param.h>  
 #include <sys/types.h>
@@ -1186,12 +1186,14 @@
 	rt = __DEVOLATILE(struct rtentry *, fle->f_rt);
 	lle = __DEVOLATILE(struct llentry *, fle->f_lle);
 	if ((rt != NULL)
+	    && lle != NULL
 	    && fle->f_fhash == hash
 	    && flowtable_key_equal(fle, key)
 	    && (proto == fle->f_proto)
 	    && (fibnum == fle->f_fibnum)
 	    && (rt->rt_flags & RTF_UP)
-	    && (rt->rt_ifp != NULL)) {
+	    && (rt->rt_ifp != NULL)
+	    && (lle->la_flags & LLE_VALID)) {
 		fs->ft_hits++;
 		fle->f_uptime = time_uptime;
 		fle->f_flags |= flags;
diff -r 32d481af6f40 -r 1b729d3573af head/sys/net/if_llatbl.c
--- a/head/sys/net/if_llatbl.c	Wed Feb 01 11:32:57 2012 +0200
+++ b/head/sys/net/if_llatbl.c	Wed Feb 01 11:33:08 2012 +0200
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/net/if_llatbl.c 229810 2012-01-08 13:34:00Z glebius $");
+__FBSDID("$FreeBSD: head/sys/net/if_llatbl.c 230598 2012-01-26 20:02:40Z kmacy $");
 
 #include "opt_ddb.h"
 #include "opt_inet.h"
@@ -122,6 +122,7 @@
 		("%s: la_numheld %d > 0, pkts_droped %zd", __func__, 
 		 lle->la_numheld, pkts_dropped));
 
+	lle->la_flags &= ~LLE_VALID;
 	LLE_FREE_LOCKED(lle);
 
 	return (pkts_dropped);
diff -r 32d481af6f40 -r 1b729d3573af head/sys/net/route.c
--- a/head/sys/net/route.c	Wed Feb 01 11:32:57 2012 +0200
+++ b/head/sys/net/route.c	Wed Feb 01 11:33:08 2012 +0200
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.3.1.1 (Berkeley) 2/23/95
- * $FreeBSD: head/sys/net/route.c 228532 2011-12-15 12:49:10Z glebius $
+ * $FreeBSD: head/sys/net/route.c 230510 2012-01-24 15:20:31Z bz $
  */
 /************************************************************************
  * Note: In this file a 'fib' is a "forwarding information base"	*
@@ -1498,10 +1498,10 @@
 #ifdef RADIX_MPATH
 			/*
 			 * in case address alias finds the first address
-			 * e.g. ifconfig bge0 192.103.54.246/24
-			 * e.g. ifconfig bge0 192.103.54.247/24
-			 * the address set in the route is 192.103.54.246
-			 * so we need to replace it with 192.103.54.247
+			 * e.g. ifconfig bge0 192.0.2.246/24
+			 * e.g. ifconfig bge0 192.0.2.247/24
+			 * the address set in the route is 192.0.2.246
+			 * so we need to replace it with 192.0.2.247
 			 */
 			if (memcmp(rt->rt_ifa->ifa_addr,
 			    ifa->ifa_addr, ifa->ifa_addr->sa_len)) {