svn commit: r197869 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/xen/xenpci net

[Bjoern A. Zeeb]

Author: bz
Date: Thu Oct  8 20:58:09 2009
New Revision: 197869
URL: http://svn.freebsd.org/changeset/base/197869

Log:
  MFC r197727:
    Put #ifdef INET around parts of the FLOWTABLE code, to unbreak
    nooptions INET kernel builds.
  
  Approved by:	re (kib)

Modified:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/net/route.c

Modified: stable/8/sys/net/route.c
==============================================================================
--- stable/8/sys/net/route.c	Thu Oct  8 20:33:12 2009	(r197868)
+++ stable/8/sys/net/route.c	Thu Oct  8 20:58:09 2009	(r197869)
@@ -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