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/net | |
| 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/net')
| -rw-r--r-- | src/net/ipv4.c | 6 | ||||
| -rw-r--r-- | src/net/udp/dns.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/net/ipv4.c b/src/net/ipv4.c index a9226d54c..b57b2f833 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, diff --git a/src/net/udp/dns.c b/src/net/udp/dns.c index 838c33b60..a93eb9168 100644 --- a/src/net/udp/dns.c +++ b/src/net/udp/dns.c @@ -652,7 +652,7 @@ struct resolver dns_resolver __resolver ( RESOLV_NORMAL ) = { */ /** IPv4 DNS server setting */ -const struct setting dns_setting __setting ( SETTING_IPv4_EXTRA, dns ) = { +const struct setting dns_setting __setting ( SETTING_IP_EXTRA, dns ) = { .name = "dns", .description = "DNS server", .tag = DHCP_DNS_SERVERS, @@ -660,7 +660,7 @@ const struct setting dns_setting __setting ( SETTING_IPv4_EXTRA, dns ) = { }; /** IPv6 DNS server setting */ -const struct setting dns6_setting __setting ( SETTING_IPv6_EXTRA, dns6 ) = { +const struct setting dns6_setting __setting ( SETTING_IP_EXTRA, dns6 ) = { .name = "dns6", .description = "DNS server", .tag = DHCPV6_DNS_SERVERS, |