On 10/22/19 4:16 PM, Daniel Kiper wrote: > On Tue, Oct 22, 2019 at 10:48:11AM +0200, Javier Martinez Canillas wrote: >> The bootp/dhcp options enum values are a mixture of hexadecimal and decimal >> numbers. Change this to consistently use hexadecimal numbers for all values. >> >> Suggested-by: Daniel Kiper <daniel.ki...@oracle.com> >> Signed-off-by: Javier Martinez Canillas <javi...@redhat.com> >> >> --- >> >> Changes in v3: >> - Add patch to cleanup bootp/dhcp options enum. >> >> Changes in v2: None >> >> include/grub/net.h | 14 +++++++------- >> 1 file changed, 7 insertions(+), 7 deletions(-) >> >> diff --git a/include/grub/net.h b/include/grub/net.h >> index 4a9069a1474..a6982990ab0 100644 >> --- a/include/grub/net.h >> +++ b/include/grub/net.h >> @@ -462,13 +462,13 @@ enum >> GRUB_NET_BOOTP_DOMAIN = 0x0f, >> GRUB_NET_BOOTP_ROOT_PATH = 0x11, >> GRUB_NET_BOOTP_EXTENSIONS_PATH = 0x12, >> - GRUB_NET_DHCP_REQUESTED_IP_ADDRESS = 50, >> - GRUB_NET_DHCP_OVERLOAD = 52, >> - GRUB_NET_DHCP_MESSAGE_TYPE = 53, >> - GRUB_NET_DHCP_SERVER_IDENTIFIER = 54, >> - GRUB_NET_DHCP_PARAMETER_REQUEST_LIST = 55, >> - GRUB_NET_DHCP_TFTP_SERVER_NAME = 66, >> - GRUB_NET_DHCP_BOOTFILE_NAME = 67, >> + GRUB_NET_DHCP_REQUESTED_IP_ADDRESS = 0x32, >> + GRUB_NET_DHCP_OVERLOAD = 0x34, >> + GRUB_NET_DHCP_MESSAGE_TYPE = 0x35, >> + GRUB_NET_DHCP_SERVER_IDENTIFIER = 0x36, >> + GRUB_NET_DHCP_PARAMETER_REQUEST_LIST = 0x37, >> + GRUB_NET_DHCP_TFTP_SERVER_NAME = 0x42, >> + GRUB_NET_DHCP_BOOTFILE_NAME = 0x43, > > Ugh... Checked RFC 2132. And it uses decimals instead of hexes. > So, could you convert all of them to decimals? If you do that > feel free to add my RB here. Sorry for the confusion. I should > consult the RFC earlier. >
Right, I should had done the same. I'll fix in v4 and also mention that RFC in the commit message. Thanks a lot for pointing it out. > Daniel > Best regards, -- Javier Martinez Canillas Software Engineer - Desktop Hardware Enablement Red Hat _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
