From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nQf2v-00026w-QJ for mharc-grub-devel@gnu.org; Sat, 05 Mar 2022 19:46:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQf2t-00024t-RJ for grub-devel@gnu.org; Sat, 05 Mar 2022 19:46:47 -0500 Received: from [2607:f8b0:4864:20::f36] (port=33296 helo=mail-qv1-xf36.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQf2s-0007FT-28 for grub-devel@gnu.org; Sat, 05 Mar 2022 19:46:47 -0500 Received: by mail-qv1-xf36.google.com with SMTP id f4so9130549qvd.0 for ; Sat, 05 Mar 2022 16:46:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=github.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VtVCFd2NZUsUylCj0nOwsa+DmhUkk2XrKrSVkhLmzXA=; b=WjTlJdyjvkFGSDgTn6Uq9/j/cS8/B0FHyrfamShaflKfNIM+NX3VKf1Hsm5X6ippE4 5adYLka1n7vxLSerEm3iy6fPZn8TU7Vi/eYqUWma+XDEbV8eJbQProJpxtR5g6iKmq++ 3p4hpSsD5/fMEEwA3j3np/9sBN74VAA3MKJFRf8d6IDAy2WEelyP6gPOq7FXx8MNnOIo ENqI4bnUngGt4FV7tqki5qPceAEgANhVtTdE3UCcSj4I1/jsXnidOT6CDQnMM0/ubTwu gSLRiMMChCdp8d1bykZPDJ3LMVZYdhFGNyM570NFBPb6cPvqZedwqk9qaShuWcy9H34M gT2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VtVCFd2NZUsUylCj0nOwsa+DmhUkk2XrKrSVkhLmzXA=; b=Yn433izu9b50bjN/zUCVw7oxnwGxXXNNb9BonY3iyzReMmtMcVYlOQuOEEjVCk60qq lm7U+6SyPz1rn2HqP163JYOFRovwN5h0rRqNRp/xbwsfLwaI9IAD9q/LQOZlPNYwADMU 9oxBK/o9jFtjKR+Yxs0ZhK5oXWSRWVdaIiULjCp6GQSo6wE5GGnhYEdmgl6Xk8YcizUo 3zlywq7t4UG8vEZbwMZ5YLtCVod7hc52m36YfSp/XlFLf78EmVgNf3JdiF0LZrFuE0dC 9vhhnfll20ukackPwPZwgrm3kC7L41np3jQrI0/vVl2bUACdo6MmA2ioAODsFHfAo/SP nSyQ== X-Gm-Message-State: AOAM53002+0qUb28BZvIRegqSV3AM/wmDTXdXlBDaBfGxX8p1WvhTiLY qYAsLjxktVLEXMfl41l2WxmGWgHPFD1E1k9feciNBoWIRu4AdjVdN11zL7JEaX4ljTxD6PTtqzy RoJSNM8524hCQsqpZP5/ZP559j6oV2MpFdZLebuUjFms1SbeMJ9scGFIe9l+ogA== X-Google-Smtp-Source: ABdhPJz2tDsnpgiY69HbSsPypyVolI73RqG5LVaJsi50f8pjA1gNwBjsnwuQIAdEHHVc5pUiqb+Pnw== X-Received: by 2002:ad4:5dc7:0:b0:435:6a9e:f342 with SMTP id m7-20020ad45dc7000000b004356a9ef342mr3904772qvh.114.1646527604813; Sat, 05 Mar 2022 16:46:44 -0800 (PST) Received: from a-Virtual-Machine.mshome.net ([136.56.89.57]) by smtp.gmail.com with ESMTPSA id j7-20020a375507000000b00663273f16d0sm4389217qkb.61.2022.03.05.16.46.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Mar 2022 16:46:44 -0800 (PST) From: Chad Kimes To: grub-devel@gnu.org Cc: Chad Kimes Subject: [PATCH 2/2] Configure VLAN from UEFI device used for PXE Date: Sat, 5 Mar 2022 19:46:40 -0500 Message-Id: <20220306004640.412289-2-chkimes@github.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220306004640.412289-1-chkimes@github.com> References: <20220306004640.412289-1-chkimes@github.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::f36 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::f36; envelope-from=chkimes@github.com; helo=mail-qv1-xf36.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Mar 2022 00:46:48 -0000 Signed-off-by: Chad Kimes --- grub-core/net/drivers/efi/efinet.c | 38 ++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c index 381c138db..98b0f6bef 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -387,11 +387,39 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, if (! pxe) continue; pxe_mode = pxe->mode; - grub_net_configure_by_dhcp_ack (card->name, card, 0, - (struct grub_net_bootp_packet *) - &pxe_mode->dhcp_ack, - sizeof (pxe_mode->dhcp_ack), - 1, device, path); + + struct grub_net_network_level_interface *inter; + inter = grub_net_configure_by_dhcp_ack (card->name, card, 0, + (struct grub_net_bootp_packet *) + &pxe_mode->dhcp_ack, + sizeof (pxe_mode->dhcp_ack), + 1, device, path); + + if (inter) + { + /* + * search the device path for any VLAN subtype and use it + * to configure the interface + */ + grub_efi_uint16_t len; + grub_efi_device_path_t *vlan_dp; + vlan_dp = dp; + + while (!GRUB_EFI_END_ENTIRE_DEVICE_PATH (vlan_dp)) + { + if (GRUB_EFI_DEVICE_PATH_TYPE (vlan_dp) == GRUB_EFI_MESSAGING_DEVICE_PATH_TYPE + && GRUB_EFI_DEVICE_PATH_SUBTYPE (vlan_dp) == GRUB_EFI_VLAN_DEVICE_PATH_SUBTYPE) + { + grub_efi_vlan_device_path_t *vlan; + vlan = (grub_efi_vlan_device_path_t *) vlan_dp; + inter->vlantag = vlan->vlan_id; + break; + } + + len = GRUB_EFI_DEVICE_PATH_LENGTH (vlan_dp); + vlan_dp = (grub_efi_device_path_t *) ((char *) vlan_dp + len); + } + } return; } } -- 2.25.1