From 5a2fa6040e17562ce742df09aa20b8774b3879c5 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 15 Jan 2023 21:36:08 +0000 Subject: [autoboot] Include VLAN tag in filter for identifying autoboot device When chainloading iPXE from a VLAN device, the MAC address of the loaded image's device handle will match the MAC address of the trunk device created by iPXE, and the autoboot process will then erroneously consider the trunk device to be an autoboot device. Fix by recording the VLAN tag along with the MAC address, and treating the VLAN tag as part of the filter used to match the MAC address against candidate network devices. Signed-off-by: Michael Brown --- src/include/usr/autoboot.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/include/usr') diff --git a/src/include/usr/autoboot.h b/src/include/usr/autoboot.h index f88b8494f..3719b8243 100644 --- a/src/include/usr/autoboot.h +++ b/src/include/usr/autoboot.h @@ -28,7 +28,8 @@ enum uriboot_flags { extern void set_autoboot_busloc ( unsigned int bus_type, unsigned int location ); -extern void set_autoboot_ll_addr ( const void *ll_addr, size_t len ); +extern void set_autoboot_ll_addr ( const void *ll_addr, size_t len, + unsigned int vlan ); extern int uriboot ( struct uri *filename, struct uri **root_paths, unsigned int root_path_count, int drive, -- cgit v1.2.3-55-g7522