From owner-svn-src-head@FreeBSD.ORG  Sun Jan 29 08:33:34 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5FD9106564A;
	Sun, 29 Jan 2012 08:33:34 +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 D4DA68FC12;
	Sun, 29 Jan 2012 08:33:34 +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 q0T8XYZN099046;
	Sun, 29 Jan 2012 08:33:34 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0T8XY7b099044;
	Sun, 29 Jan 2012 08:33:34 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201201290833.q0T8XY7b099044@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sun, 29 Jan 2012 08:33:34 +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: r230726 - head/etc/rc.d
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Jan 2012 08:33:35 -0000

Author: hrs
Date: Sun Jan 29 08:33:34 2012
New Revision: 230726
URL: http://svn.freebsd.org/changeset/base/230726

Log:
  Perform IPv6 DAD only in ifn_start.

Modified:
  head/etc/rc.d/netif

Modified: head/etc/rc.d/netif
==============================================================================
--- head/etc/rc.d/netif	Sun Jan 29 08:03:45 2012	(r230725)
+++ head/etc/rc.d/netif	Sun Jan 29 08:33:34 2012	(r230726)
@@ -138,10 +138,12 @@ network_common()
 	done
 
 	# inet6 address configuration needs sleep for DAD.
-	if [ -n "${_dadwait}" ]; then
+	case ${_func}:${_dadwait} in
+	ifn_start:1)
 		sleep `${SYSCTL_N} net.inet6.ip6.dad_count`
 		sleep 1
-	fi
+	;;
+	esac
 
 	_str=
 	if [ -n "${_ok}" ]; then