From owner-svn-src-all@FreeBSD.ORG  Mon Sep 13 19:53:22 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D2E241065674;
	Mon, 13 Sep 2010 19:53:22 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C2E1A8FC24;
	Mon, 13 Sep 2010 19:53:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8DJrMoo028547;
	Mon, 13 Sep 2010 19:53:22 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8DJrMhO028545;
	Mon, 13 Sep 2010 19:53:22 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201009131953.o8DJrMhO028545@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 13 Sep 2010 19:53:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212577 - head/etc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Sep 2010 19:53:22 -0000

Author: hrs
Date: Mon Sep 13 19:53:22 2010
New Revision: 212577
URL: http://svn.freebsd.org/changeset/base/212577

Log:
  - Check some specific IFs first in ipv6_autoconfif().
  - $ipv6_enable supports YES|TRUE|ON|1 as in checkyesno().
  
  Based on:	changes in r206408 by dougb

Modified:
  head/etc/network.subr

Modified: head/etc/network.subr
==============================================================================
--- head/etc/network.subr	Mon Sep 13 19:52:46 2010	(r212576)
+++ head/etc/network.subr	Mon Sep 13 19:53:22 2010	(r212577)
@@ -108,7 +108,7 @@ ifconfig_up()
 
 			# backward compatibility: $ipv6_enable
 			case $ipv6_enable in
-			[Yy][Ee][Ss])
+			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 				_ipv6_opts="${_ipv6_opts} accept_rtadv"
 				;;
 			esac
@@ -385,6 +385,7 @@ noafif()
 	an[0-9]*|\
 	ath[0-9]*|\
 	ipw[0-9]*|\
+	ipfw[0-9]*|\
 	iwi[0-9]*|\
 	iwn[0-9]*|\
 	ral[0-9]*|\
@@ -444,12 +445,21 @@ ipv6_autoconfif()
 	local _if _tmpargs _arg
 	_if=$1
 
-	if ! ipv6if $_if; then
+	case $_if in
+	lo0|\
+	stf[0-9]*|\
+	faith[0-9]*|\
+	lp[0-9]*|\
+	sl[0-9]*)
 		return 1
-	fi
+		;;
+	esac
 	if noafif $_if; then
 		return 1
 	fi
+	if ! ipv6if $_if; then
+		return 1
+	fi
 	if checkyesno ipv6_gateway_enable; then
 		return 1
 	fi
@@ -457,24 +467,11 @@ ipv6_autoconfif()
 	if [ -n "${_tmpargs}" ]; then
 		return 1
 	fi
-
-	case $_if in
-	lo0|\
-	stf[0-9]*|\
-	faith[0-9]*|\
-	lp[0-9]*|\
-	sl[0-9]*|\
-	pflog[0-9]*|\
-	pfsync[0-9]*)
-		return 1
-		;;
-	esac
-
 	# backward compatibility: $ipv6_enable
 	case $ipv6_enable in
-	[Yy][Ee][Ss])
+	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 		return 0
-		;;
+	;;
 	esac
 
 	_tmpargs=`_ifconfig_getargs $_if ipv6`