From owner-svn-src-stable@FreeBSD.ORG  Sat Jun 18 22:09:44 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B76781065674;
	Sat, 18 Jun 2011 22:09:44 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A650F8FC18;
	Sat, 18 Jun 2011 22:09:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5IM9iti059108;
	Sat, 18 Jun 2011 22:09:44 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5IM9i45059105;
	Sat, 18 Jun 2011 22:09:44 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201106182209.p5IM9i45059105@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 18 Jun 2011 22:09:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223273 - in stable/7/sys: netinet netinet6
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Jun 2011 22:09:44 -0000

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;