svn commit: r187041 - user/kmacy/HEAD_fast_net/sys/net

[Kip Macy]

Author: kmacy
Date: Sun Jan 11 04:18:13 2009
New Revision: 187041
URL: http://svn.freebsd.org/changeset/base/187041

Log:
  - fix radix_mpath comment
  - remove shutdown flag and message

Modified:
  user/kmacy/HEAD_fast_net/sys/net/radix_mpath.c
  user/kmacy/HEAD_fast_net/sys/net/route.c
  user/kmacy/HEAD_fast_net/sys/net/route.h

Modified: user/kmacy/HEAD_fast_net/sys/net/radix_mpath.c
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/net/radix_mpath.c	Sun Jan 11 03:19:13 2009	(r187040)
+++ user/kmacy/HEAD_fast_net/sys/net/radix_mpath.c	Sun Jan 11 04:18:13 2009	(r187041)
@@ -77,17 +77,15 @@ rn_mpath_next(struct radix_node *rn)
 		return NULL;
 }
 
-u_int32_t
+uint32_t
 rn_mpath_count(struct radix_node *rn)
 {
 	uint32_t i = 0;
 	struct rtentry *rt;
 	
 	while (rn != NULL) {
-		
 		rt = (struct rtentry *)rn;
-		if ((rt->rt_flags & RTF_SHUTDOWN) == 0)
-			i += rt->rt_rmx.rmx_weight;
+		i += rt->rt_rmx.rmx_weight;
 		rn = rn_mpath_next(rn);
 	}
 	return (i);
@@ -303,7 +301,7 @@ rtalloc_mpath_fib(struct route *ro, uint
 	}
 	/* XXX try filling rt_gwroute and avoid unreachable gw  */
 
-	/* if gw selection fails, use the first match (default) */
+	/* gw selection has failed - there must be only zero weight routes */
 	if (!rn) {
 		RT_UNLOCK(ro->ro_rt);
 		ro->ro_rt = NULL;

Modified: user/kmacy/HEAD_fast_net/sys/net/route.c
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/net/route.c	Sun Jan 11 03:19:13 2009	(r187040)
+++ user/kmacy/HEAD_fast_net/sys/net/route.c	Sun Jan 11 04:18:13 2009	(r187041)
@@ -881,9 +881,7 @@ rn_mpath_update(int req, struct rt_addri
 	}
 	
 nondelete:
-	if (req == RTM_SHUTDOWN)
-		rt->rt_flags |= RTF_SHUTDOWN;
-	else if (req != RTM_DELETE)
+	if (req != RTM_DELETE)
 		panic("unrecognized request %d", req);
 	
 
@@ -940,7 +938,6 @@ rtrequest1_fib(int req, struct rt_addrin
 	switch (req) {
 	case RTM_DELETE:
 #ifdef RADIX_MPATH
-	case RTM_SHUTDOWN:
 		if (rn_mpath_capable(rnh)) {
 			error = rn_mpath_update(req, info, rnh, ret_nrt);
 			/*

Modified: user/kmacy/HEAD_fast_net/sys/net/route.h
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/net/route.h	Sun Jan 11 03:19:13 2009	(r187040)
+++ user/kmacy/HEAD_fast_net/sys/net/route.h	Sun Jan 11 04:18:13 2009	(r187041)
@@ -198,13 +198,13 @@ struct ortentry {
 #define	RTF_MULTICAST	0x800000	/* route represents a mcast address */
 					/* 0x8000000 and up unassigned */
 #define	RTF_STICKY	 0x10000000	/* always route dst->src */
-#define	RTF_SHUTDOWN	 0x20000000	/* no new connections */
-#define	RTF_RNH_LOCKED	 0x40000000
+
+#define	RTF_RNH_LOCKED	 0x40000000	/* radix node head is locked */
 
 /* Mask of RTF flags that are allowed to be modified by RTM_CHANGE. */
 #define RTF_FMASK	\
 	(RTF_PROTO1 | RTF_PROTO2 | RTF_PROTO3 | RTF_BLACKHOLE | \
-	 RTF_REJECT | RTF_STATIC | RTF_SHUTDOWN | RTF_STICKY)
+	 RTF_REJECT | RTF_STATIC | RTF_STICKY)
 
 /*
  * Routing statistics.
@@ -257,7 +257,6 @@ struct rt_msghdr {
 #define	RTM_DELMADDR	0x10	/* mcast group membership being deleted */
 #define	RTM_IFANNOUNCE	0x11	/* iface arrival/departure */
 #define	RTM_IEEE80211	0x12	/* IEEE80211 wireless event */
-#define	RTM_SHUTDOWN	0x13	/* don't use for new connections */
 
 /*
  * Bitmask values for rtm_inits and rmx_locks.