diff options
| author | Michael Brown | 2016-07-04 14:15:05 +0200 |
|---|---|---|
| committer | Michael Brown | 2016-07-04 14:15:05 +0200 |
| commit | 3d9f094022854ca06d02f34c688896abde9e1b20 (patch) | |
| tree | 3905fa7145b191aaa733fceea7f11f2a24b2f0dc /src/arch/i386/include/efi/ipxe/dhcp_arch.h | |
| parent | [pxe] Disable interrupts on the PIC before starting NBP (diff) | |
| download | ipxe-3d9f094022854ca06d02f34c688896abde9e1b20.tar.gz ipxe-3d9f094022854ca06d02f34c688896abde9e1b20.tar.xz ipxe-3d9f094022854ca06d02f34c688896abde9e1b20.zip | |
[dhcp] Allow for variable encapsulation of architecture-specific options
DHCPv4 and DHCPv6 share some values in common for the architecture-
specific options (such as the client system architecture type), but
use different encapsulations: DHCPv4 has a single byte for the option
length while DHCPv6 has a 16-bit field for the option length.
Move the containing DHCP_OPTION() and related wrappers from the
individual dhcp_arch.h files to dhcp.c, thus allowing for the
architecture-specific values to be reused in dhcpv6.c.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/i386/include/efi/ipxe/dhcp_arch.h')
| -rw-r--r-- | src/arch/i386/include/efi/ipxe/dhcp_arch.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/arch/i386/include/efi/ipxe/dhcp_arch.h b/src/arch/i386/include/efi/ipxe/dhcp_arch.h index c17c1ea5..74027928 100644 --- a/src/arch/i386/include/efi/ipxe/dhcp_arch.h +++ b/src/arch/i386/include/efi/ipxe/dhcp_arch.h @@ -33,14 +33,13 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <ipxe/dhcp.h> -#define DHCP_ARCH_VENDOR_CLASS_ID \ - DHCP_STRING ( 'P', 'X', 'E', 'C', 'l', 'i', 'e', 'n', 't', ':', \ - 'A', 'r', 'c', 'h', ':', '0', '0', '0', '0', '6', ':', \ - 'U', 'N', 'D', 'I', ':', '0', '0', '3', '0', '1', '0' ) +#define DHCP_ARCH_VENDOR_CLASS_ID \ + 'P', 'X', 'E', 'C', 'l', 'i', 'e', 'n', 't', ':', \ + 'A', 'r', 'c', 'h', ':', '0', '0', '0', '0', '6', ':', \ + 'U', 'N', 'D', 'I', ':', '0', '0', '3', '0', '1', '0' -#define DHCP_ARCH_CLIENT_ARCHITECTURE \ - DHCP_WORD ( DHCP_CLIENT_ARCHITECTURE_IA32 ) +#define DHCP_ARCH_CLIENT_ARCHITECTURE DHCP_CLIENT_ARCHITECTURE_IA32 -#define DHCP_ARCH_CLIENT_NDI DHCP_OPTION ( 1 /* UNDI */ , 3, 10 /* v3.10 */ ) +#define DHCP_ARCH_CLIENT_NDI 1 /* UNDI */ , 3, 10 /* v3.10 */ #endif |