diff options
| author | Michael Brown <mcb30@ipxe.org> | 2013-12-05 15:11:15 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2013-12-05 15:11:15 +0000 |
| commit | f3e5df3162b9e9dec0e91e59ad2567bcc78ef03d (patch) | |
| tree | 878418a9722ed7a826d214792859883d8d5e4be4 /src/net/ipv4.c | |
| parent | eaa86156484d72f50825fec3e313a732f258fd31 (diff) | |
| download | ipxe-f3e5df3162b9e9dec0e91e59ad2567bcc78ef03d.zip ipxe-f3e5df3162b9e9dec0e91e59ad2567bcc78ef03d.tar.gz ipxe-f3e5df3162b9e9dec0e91e59ad2567bcc78ef03d.tar.bz2 | |
[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/net/ipv4.c')
| -rw-r--r-- | src/net/ipv4.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net/ipv4.c b/src/net/ipv4.c index a9226d5..b57b2f8 100644 --- a/src/net/ipv4.c +++ b/src/net/ipv4.c @@ -636,7 +636,7 @@ int format_ipv4_setting ( const struct setting_type *type __unused, } /** IPv4 address setting */ -const struct setting ip_setting __setting ( SETTING_IPv4, ip ) = { +const struct setting ip_setting __setting ( SETTING_IP, ip ) = { .name = "ip", .description = "IP address", .tag = DHCP_EB_YIADDR, @@ -644,7 +644,7 @@ const struct setting ip_setting __setting ( SETTING_IPv4, ip ) = { }; /** IPv4 subnet mask setting */ -const struct setting netmask_setting __setting ( SETTING_IPv4, netmask ) = { +const struct setting netmask_setting __setting ( SETTING_IP, netmask ) = { .name = "netmask", .description = "Subnet mask", .tag = DHCP_SUBNET_MASK, @@ -652,7 +652,7 @@ const struct setting netmask_setting __setting ( SETTING_IPv4, netmask ) = { }; /** Default gateway setting */ -const struct setting gateway_setting __setting ( SETTING_IPv4, gateway ) = { +const struct setting gateway_setting __setting ( SETTING_IP, gateway ) = { .name = "gateway", .description = "Default gateway", .tag = DHCP_ROUTERS, |