svn commit: r197727 - head/sys/net

Bjoern A. Zeeb bz at FreeBSD.org
Sat Oct 3 10:56:04 UTC 2009


Author: bz
Date: Sat Oct  3 10:56:03 2009
New Revision: 197727
URL: http://svn.freebsd.org/changeset/base/197727

Log:
  Put #ifdef INET around parts of the FLOWTABLE code, to unbreak
  nooptions INET kernel builds.
  
  MFC after:	3 days
  X-MFC:		with r197687

Modified:
  head/sys/net/route.c

Modified: head/sys/net/route.c
==============================================================================
--- head/sys/net/route.c	Sat Oct  3 10:50:00 2009	(r197726)
+++ head/sys/net/route.c	Sat Oct  3 10:56:03 2009	(r197727)
@@ -1162,6 +1162,7 @@ rtrequest1_fib(int req, struct rt_addrin
 		/* XXX
 		 * "flow-table" only support IPv4 at the moment.
 		 */
+#ifdef INET
 		if (dst->sa_family == AF_INET) {
 			rn = rnh->rnh_matchaddr(dst, rnh);
 			if (rn && ((rn->rn_flags & RNF_ROOT) == 0)) {
@@ -1203,6 +1204,7 @@ rtrequest1_fib(int req, struct rt_addrin
 			}
 		}
 #endif
+#endif
 
 		/* XXX mtu manipulation will be done in rnh_addaddr -- itojun */
 		rn = rnh->rnh_addaddr(ndst, netmask, rnh, rt->rt_nodes);
@@ -1224,7 +1226,9 @@ rtrequest1_fib(int req, struct rt_addrin
 		} 
 #ifdef FLOWTABLE
 		else if (rt0 != NULL) {
+#ifdef INET
 			flowtable_route_flush(V_ip_ft, rt0);
+#endif
 			RTFREE(rt0);
 		}
 #endif


More information about the svn-src-all mailing list