From owner-svn-src-all@FreeBSD.ORG  Tue Sep 15 22:09:43 2009
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 4FDC51065676;
	Tue, 15 Sep 2009 22:09:43 +0000 (UTC)
	(envelope-from qingli@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3F1AB8FC15;
	Tue, 15 Sep 2009 22:09:43 +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 n8FM9gQK004482;
	Tue, 15 Sep 2009 22:09:42 GMT (envelope-from qingli@svn.freebsd.org)
Received: (from qingli@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8FM9ghw004481;
	Tue, 15 Sep 2009 22:09:42 GMT (envelope-from qingli@svn.freebsd.org)
Message-Id: <200909152209.n8FM9ghw004481@svn.freebsd.org>
From: Qing Li <qingli@FreeBSD.org>
Date: Tue, 15 Sep 2009 22:09:42 +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: r197235 - head/sys/nfsclient
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: Tue, 15 Sep 2009 22:09:43 -0000

Author: qingli
Date: Tue Sep 15 22:09:42 2009
New Revision: 197235
URL: http://svn.freebsd.org/changeset/base/197235

Log:
  Reverting the previous change for now. Some users reports the patch
  fixes their issues but one reports a failure in NFS ROOT. Revert
  the change for now pending further investigation.
  
  Reviewed by:	bz
  MFC after:	immediately

Modified:
  head/sys/nfsclient/nfs_vfsops.c

Modified: head/sys/nfsclient/nfs_vfsops.c
==============================================================================
--- head/sys/nfsclient/nfs_vfsops.c	Tue Sep 15 21:15:29 2009	(r197234)
+++ head/sys/nfsclient/nfs_vfsops.c	Tue Sep 15 22:09:42 2009	(r197235)
@@ -464,6 +464,10 @@ nfs_mountroot(struct mount *mp)
 	}
 #endif
 
+	error = ifioctl(so, SIOCAIFADDR, (caddr_t)&nd->myif, td);
+	if (error)
+		panic("nfs_mountroot: SIOCAIFADDR: %d", error);
+
 	if ((cp = getenv("boot.netif.mtu")) != NULL) {
 		ir.ifr_mtu = strtol(cp, NULL, 10);
 		bcopy(nd->myif.ifra_name, ir.ifr_name, IFNAMSIZ);