svn commit: r247379 - projects/uefi/sys/boot/efi/libefi

[Benno Rice]

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;
 	}