diff --git a/stand/efi/include/efilib.h b/stand/efi/include/efilib.h
index 4272d321e70b..4745ad04e413 100644
--- a/stand/efi/include/efilib.h
+++ b/stand/efi/include/efilib.h
@@ -85,6 +85,7 @@ EFI_HANDLE efi_devpath_handle(EFI_DEVICE_PATH *);
 EFI_DEVICE_PATH *efi_devpath_last_node(EFI_DEVICE_PATH *);
 EFI_DEVICE_PATH *efi_devpath_trim(EFI_DEVICE_PATH *);
 bool efi_devpath_match(EFI_DEVICE_PATH *, EFI_DEVICE_PATH *);
+bool efi_devpath_match_node(EFI_DEVICE_PATH *, EFI_DEVICE_PATH *);
 bool efi_devpath_is_prefix(EFI_DEVICE_PATH *, EFI_DEVICE_PATH *);
 CHAR16 *efi_devpath_name(EFI_DEVICE_PATH *);
 void efi_free_devpath_name(CHAR16 *);
diff --git a/stand/efi/libefi/devpath.c b/stand/efi/libefi/devpath.c
index f02a145eed8b..6be1bcbdb9b7 100644
--- a/stand/efi/libefi/devpath.c
+++ b/stand/efi/libefi/devpath.c
@@ -140,25 +140,33 @@ efi_devpath_handle(EFI_DEVICE_PATH *devpath)
 }
 
 bool
-efi_devpath_match(EFI_DEVICE_PATH *devpath1, EFI_DEVICE_PATH *devpath2)
+efi_devpath_match_node(EFI_DEVICE_PATH *devpath1, EFI_DEVICE_PATH *devpath2)
 {
 	size_t len;
 
+	if (devpath1 == NULL || devpath2 == NULL)
+		return (false);
+	if (DevicePathType(devpath1) != DevicePathType(devpath2) ||
+	    DevicePathSubType(devpath1) != DevicePathSubType(devpath2))
+		return (false);
+	len = DevicePathNodeLength(devpath1);
+	if (len != DevicePathNodeLength(devpath2))
+		return (false);
+	if (memcmp(devpath1, devpath2, len) != 0)
+		return (false);
+	return (true);
+}
+
+bool
+efi_devpath_match(EFI_DEVICE_PATH *devpath1, EFI_DEVICE_PATH *devpath2)
+{
+
 	if (devpath1 == NULL || devpath2 == NULL)
 		return (false);
 
 	while (true) {
-		if (DevicePathType(devpath1) != DevicePathType(devpath2) ||
-		    DevicePathSubType(devpath1) != DevicePathSubType(devpath2))
-			return (false);
-
-		len = DevicePathNodeLength(devpath1);
-		if (len != DevicePathNodeLength(devpath2))
-			return (false);
-
-		if (memcmp(devpath1, devpath2, len) != 0)
-			return (false);
-
+		if (!efi_devpath_match_node(devpath1, devpath2))
+			return false;
 		if (IsDevicePathEnd(devpath1))
 			break;
 		devpath1 = NextDevicePathNode(devpath1);