svn commit: r223273 - in stable/7/sys: netinet netinet6

[Bjoern A. Zeeb]

Author: bz
Date: Sat Jun 18 22:09:44 2011
New Revision: 223273
URL: http://svn.freebsd.org/changeset/base/223273

Log:
  MFC r222272:
  
    Add FEATURE() definitions for IPv4 and IPv6 so that we can use
    feature_present(3) to dynamically decide whether to use one or the
    other family.

Modified:
  stable/7/sys/netinet/in_proto.c
  stable/7/sys/netinet6/in6_proto.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/netinet/in_proto.c
==============================================================================
--- stable/7/sys/netinet/in_proto.c	Sat Jun 18 22:09:22 2011	(r223272)
+++ stable/7/sys/netinet/in_proto.c	Sat Jun 18 22:09:44 2011	(r223273)
@@ -91,6 +91,8 @@ static struct pr_usrreqs nousrreqs;
 #include <netinet/ip_carp.h>
 #endif
 
+FEATURE(inet, "Internet Protocol version 4");
+
 extern	struct domain inetdomain;
 
 /* Spacer for loadable protocols. */

Modified: stable/7/sys/netinet6/in6_proto.c
==============================================================================
--- stable/7/sys/netinet6/in6_proto.c	Sat Jun 18 22:09:22 2011	(r223272)
+++ stable/7/sys/netinet6/in6_proto.c	Sat Jun 18 22:09:44 2011	(r223273)
@@ -127,6 +127,7 @@ __FBSDID("$FreeBSD$");
 /*
  * TCP/IP protocol family: IP6, ICMP6, UDP, TCP.
  */
+FEATURE(inet6, "Internet Protocol version 6");
 
 extern	struct domain inet6domain;
 static	struct pr_usrreqs nousrreqs;