diff options
| author | Michael Brown | 2013-12-05 16:11:15 +0100 |
|---|---|---|
| committer | Michael Brown | 2013-12-05 16:11:15 +0100 |
| commit | f3e5df3162b9e9dec0e91e59ad2567bcc78ef03d (patch) | |
| tree | 878418a9722ed7a826d214792859883d8d5e4be4 /src/include/ipxe/settings.h | |
| parent | [settings] Allow for multiple definitions of each predefined setting (diff) | |
| download | ipxe-f3e5df3162b9e9dec0e91e59ad2567bcc78ef03d.tar.gz ipxe-f3e5df3162b9e9dec0e91e59ad2567bcc78ef03d.tar.xz ipxe-f3e5df3162b9e9dec0e91e59ad2567bcc78ef03d.zip | |
[settings] Merge SETTING_IPv4 and SETTING_IPv6
Allow for equivalent IPv4 and IPv6 settings (which requires equivalent
settings to be adjacent within the settings list).
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include/ipxe/settings.h')
| -rw-r--r-- | src/include/ipxe/settings.h | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/src/include/ipxe/settings.h b/src/include/ipxe/settings.h index 96364765..642b1d4c 100644 --- a/src/include/ipxe/settings.h +++ b/src/include/ipxe/settings.h @@ -62,20 +62,18 @@ struct setting { #define SETTING_NETDEV 01 /**< Network device settings */ #define SETTING_NETDEV_EXTRA 02 /**< Network device additional settings */ -#define SETTING_IPv4 03 /**< IPv4 settings */ -#define SETTING_IPv4_EXTRA 04 /**< IPv4 additional settings */ -#define SETTING_IPv6 05 /**< IPv6 settings */ -#define SETTING_IPv6_EXTRA 06 /**< IPv6 additional settings */ -#define SETTING_BOOT 07 /**< Generic boot settings */ -#define SETTING_BOOT_EXTRA 08 /**< Generic boot additional settings */ -#define SETTING_SANBOOT 09 /**< SAN boot settings */ -#define SETTING_SANBOOT_EXTRA 10 /**< SAN boot additional settings */ -#define SETTING_HOST 11 /**< Host identity settings */ -#define SETTING_HOST_EXTRA 12 /**< Host identity additional settings */ -#define SETTING_AUTH 13 /**< Authentication settings */ -#define SETTING_AUTH_EXTRA 14 /**< Authentication additional settings */ -#define SETTING_CRYPTO 15 /**< Cryptography settings */ -#define SETTING_MISC 16 /**< Miscellaneous settings */ +#define SETTING_IP 03 /**< IPv4 settings */ +#define SETTING_IP_EXTRA 04 /**< IPv4 additional settings */ +#define SETTING_BOOT 05 /**< Generic boot settings */ +#define SETTING_BOOT_EXTRA 06 /**< Generic boot additional settings */ +#define SETTING_SANBOOT 07 /**< SAN boot settings */ +#define SETTING_SANBOOT_EXTRA 08 /**< SAN boot additional settings */ +#define SETTING_HOST 09 /**< Host identity settings */ +#define SETTING_HOST_EXTRA 10 /**< Host identity additional settings */ +#define SETTING_AUTH 11 /**< Authentication settings */ +#define SETTING_AUTH_EXTRA 12 /**< Authentication additional settings */ +#define SETTING_CRYPTO 13 /**< Cryptography settings */ +#define SETTING_MISC 14 /**< Miscellaneous settings */ /** @} */ @@ -421,17 +419,17 @@ extern const struct setting_type setting_type_uuid __setting_type; extern const struct setting_type setting_type_busdevfn __setting_type; extern const struct setting -ip_setting __setting ( SETTING_IPv4, ip ); +ip_setting __setting ( SETTING_IP, ip ); extern const struct setting -netmask_setting __setting ( SETTING_IPv4, netmask ); +netmask_setting __setting ( SETTING_IP, netmask ); extern const struct setting -gateway_setting __setting ( SETTING_IPv4, gateway ); +gateway_setting __setting ( SETTING_IP, gateway ); extern const struct setting -dns_setting __setting ( SETTING_IPv4_EXTRA, dns ); +dns_setting __setting ( SETTING_IP_EXTRA, dns ); extern const struct setting hostname_setting __setting ( SETTING_HOST, hostname ); extern const struct setting -domain_setting __setting ( SETTING_IPv4_EXTRA, domain ); +domain_setting __setting ( SETTING_IP_EXTRA, domain ); extern const struct setting filename_setting __setting ( SETTING_BOOT, filename ); extern const struct setting |