From owner-svn-src-projects@FreeBSD.ORG  Wed Feb 27 04:55:56 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 33EA33BF;
 Wed, 27 Feb 2013 04:55:56 +0000 (UTC)
 (envelope-from benno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 22B38956;
 Wed, 27 Feb 2013 04:55:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1R4turx009055;
 Wed, 27 Feb 2013 04:55:56 GMT (envelope-from benno@svn.freebsd.org)
Received: (from benno@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1R4ttPH009053;
 Wed, 27 Feb 2013 04:55:55 GMT (envelope-from benno@svn.freebsd.org)
Message-Id: <201302270455.r1R4ttPH009053@svn.freebsd.org>
From: Benno Rice <benno@FreeBSD.org>
Date: Wed, 27 Feb 2013 04:55:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r247379 - projects/uefi/sys/boot/efi/libefi
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Feb 2013 04:55:56 -0000

Author: benno
Date: Wed Feb 27 04:55:55 2013
New Revision: 247379
URL: http://svnweb.freebsd.org/changeset/base/247379

Log:
  Fix network device registration.

Modified:
  projects/uefi/sys/boot/efi/libefi/efinet.c
  projects/uefi/sys/boot/efi/libefi/handles.c

Modified: projects/uefi/sys/boot/efi/libefi/efinet.c
==============================================================================
--- projects/uefi/sys/boot/efi/libefi/efinet.c	Wed Feb 27 04:50:27 2013	(r247378)
+++ projects/uefi/sys/boot/efi/libefi/efinet.c	Wed Feb 27 04:55:55 2013	(r247379)
@@ -274,7 +274,7 @@ efinet_dev_init()
 	if (EFI_ERROR(status))
 		return (efi_status_to_errno(status));
 	nifs = sz / sizeof(EFI_HANDLE);
-	err = efi_register_handles(&efinet_dev, handles, nifs);
+	err = efi_register_handles(&efinet_dev, handles, NULL, nifs);
 	free(handles);
 	if (err != 0)
 		return (err);

Modified: projects/uefi/sys/boot/efi/libefi/handles.c
==============================================================================
--- projects/uefi/sys/boot/efi/libefi/handles.c	Wed Feb 27 04:50:27 2013	(r247378)
+++ projects/uefi/sys/boot/efi/libefi/handles.c	Wed Feb 27 04:55:55 2013	(r247379)
@@ -53,7 +53,10 @@ efi_register_handles(struct devsw *sw, E
 	entry = (entry == NULL) ? malloc(sz) : realloc(entry, sz);
 	for (unit = 0; idx < nentries; idx++, unit++) {
 		entry[idx].handle = handles[unit];
-		entry[idx].alias = aliases[unit];
+		if (aliases != NULL)
+			entry[idx].alias = aliases[unit];
+		else
+			entry[idx].alias = NULL;
 		entry[idx].dev = sw;
 		entry[idx].unit = unit;
 	}