From owner-svn-src-all@FreeBSD.ORG  Wed Nov 23 21:41:32 2011
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 1670D1065670;
	Wed, 23 Nov 2011 21:41:32 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 058F58FC13;
	Wed, 23 Nov 2011 21:41:32 +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 pANLfVLv064382;
	Wed, 23 Nov 2011 21:41:31 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pANLfVbZ064380;
	Wed, 23 Nov 2011 21:41:31 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201111232141.pANLfVbZ064380@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 23 Nov 2011 21:41:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227910 - releng/9.0/etc stable/9/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: Wed, 23 Nov 2011 21:41:32 -0000

Author: delphij
Date: Wed Nov 23 21:41:31 2011
New Revision: 227910
URL: http://svn.freebsd.org/changeset/base/227910

Log:
  MFC r225849:
  
  Test if the interface is afif in dhcpif() and syncdhcpif(), as
  done in ipv6_autoconfif.
  
  This fixes a regression that causes e.g. ifconfig_DEFAULT="DHCP"
  to run on non-afif interfaces like pfsync0, which in turn would
  cause excessive delay on system startup.
  
  Sponsored by:	iXsystems, Inc.
  Reviewed by:	hrs (freebsd-rc@)
  Approved by:	re (bz)

Modified:
  stable/9/etc/network.subr
Directory Properties:
  stable/9/etc/   (props changed)

Changes in other areas also in this revision:
Modified:
  releng/9.0/etc/network.subr
Directory Properties:
  releng/9.0/etc/   (props changed)

Modified: stable/9/etc/network.subr
==============================================================================
--- stable/9/etc/network.subr	Wed Nov 23 21:19:38 2011	(r227909)
+++ stable/9/etc/network.subr	Wed Nov 23 21:41:31 2011	(r227910)
@@ -297,6 +297,10 @@ dhcpif()
 	local _tmpargs _arg
 	_tmpargs=`_ifconfig_getargs $1`
 
+	if noafif $1; then
+		return 1
+	fi
+
 	for _arg in $_tmpargs; do
 		case $_arg in
 		[Dd][Hh][Cc][Pp])
@@ -322,6 +326,10 @@ syncdhcpif()
 	local _tmpargs _arg
 	_tmpargs=`_ifconfig_getargs $1`
 
+	if noafif $1; then
+		return 1
+	fi
+
 	for _arg in $_tmpargs; do
 		case $_arg in
 		[Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp])