10411 loader: dev_net: correct net_open's interpretation of params

Reviewed by: Gergő Doma <[email protected]> Reviewed by: C Fraire <[email protected]> Approved by: Dan McDonald <[email protected]>
illumos · Feb 18, 2019 · ca4fa6c · ca4fa6c
1 parent 08b0760
commit ca4fa6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version
@@ -33,4 +33,4 @@ LOADER_VERSION = 1.1
 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes.
 # The version is processed from left to right, the version number can only
 # be increased.
-BOOT_VERSION = $(LOADER_VERSION)-2019.01.17.1
+BOOT_VERSION = $(LOADER_VERSION)-2019.02.16.1
diff --git a/usr/src/boot/sys/boot/common/dev_net.c b/usr/src/boot/sys/boot/common/dev_net.c
@@ -123,13 +123,15 @@ net_open(struct open_file *f, ...)
 {
 	struct iodesc *d;
 	va_list args;
-	char *devname;		/* Device part of file name (or NULL). */
+	struct devdesc *dev;
+	const char *devname;	/* Device part of file name (or NULL). */
 	int error = 0;
 
 	va_start(args, f);
-	devname = va_arg(args, char *);
+	dev = va_arg(args, struct devdesc *);
 	va_end(args);
 
+	devname = dev->d_dev->dv_name;
 	/* Before opening another interface, close the previous one first. */
 	if (netdev_sock >= 0 && strcmp(devname, netdev_name) != 0)
 		net_cleanup();
@@ -138,7 +140,7 @@ net_open(struct open_file *f, ...)
 	if (netdev_opens == 0) {
 		/* Find network interface. */
 		if (netdev_sock < 0) {
-			netdev_sock = netif_open(devname);
+			netdev_sock = netif_open(dev);
 			if (netdev_sock < 0) {
 				printf("net_open: netif_open() failed\n");
 				return (ENXIO);