diff options
| author | Michael Brown | 2016-07-15 17:52:47 +0200 |
|---|---|---|
| committer | Michael Brown | 2016-07-15 18:39:49 +0200 |
| commit | ecfc81d76f584a9e5878d940b376d1a0e7a8aa66 (patch) | |
| tree | 216803237b91ce1663862eb6d53b0f00f2d6a69c /src/net | |
| parent | [ipv6] Perform SLAAC only during autoconfiguration (diff) | |
| download | ipxe-ecfc81d76f584a9e5878d940b376d1a0e7a8aa66.tar.gz ipxe-ecfc81d76f584a9e5878d940b376d1a0e7a8aa66.tar.xz ipxe-ecfc81d76f584a9e5878d940b376d1a0e7a8aa66.zip | |
[settings] Create space for IPv6 in settings display order
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/ndp.c | 2 | ||||
| -rw-r--r-- | src/net/udp/dns.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/net/ipv4.c b/src/net/ipv4.c index 865cfb60..b4148d8e 100644 --- a/src/net/ipv4.c +++ b/src/net/ipv4.c @@ -788,7 +788,7 @@ int format_ipv4_setting ( const struct setting_type *type __unused, } /** IPv4 address setting */ -const struct setting ip_setting __setting ( SETTING_IP, ip ) = { +const struct setting ip_setting __setting ( SETTING_IP4, ip ) = { .name = "ip", .description = "IP address", .tag = DHCP_EB_YIADDR, @@ -796,7 +796,7 @@ const struct setting ip_setting __setting ( SETTING_IP, ip ) = { }; /** IPv4 subnet mask setting */ -const struct setting netmask_setting __setting ( SETTING_IP, netmask ) = { +const struct setting netmask_setting __setting ( SETTING_IP4, netmask ) = { .name = "netmask", .description = "Subnet mask", .tag = DHCP_SUBNET_MASK, @@ -804,7 +804,7 @@ const struct setting netmask_setting __setting ( SETTING_IP, netmask ) = { }; /** Default gateway setting */ -const struct setting gateway_setting __setting ( SETTING_IP, gateway ) = { +const struct setting gateway_setting __setting ( SETTING_IP4, gateway ) = { .name = "gateway", .description = "Default gateway", .tag = DHCP_ROUTERS, diff --git a/src/net/ndp.c b/src/net/ndp.c index 0a68ec78..fb6f3231 100644 --- a/src/net/ndp.c +++ b/src/net/ndp.c @@ -785,7 +785,7 @@ static int ndp_register_settings ( struct net_device *netdev, } /** DNS server setting */ -const struct setting ndp_dns6_setting __setting ( SETTING_IP_EXTRA, dns6 ) = { +const struct setting ndp_dns6_setting __setting ( SETTING_IP6_EXTRA, dns6 ) = { .name = "dns6", .description = "DNS server", .tag = NDP_TAG ( NDP_OPT_RDNSS, diff --git a/src/net/udp/dns.c b/src/net/udp/dns.c index 2d77477f..5a9836cb 100644 --- a/src/net/udp/dns.c +++ b/src/net/udp/dns.c @@ -1048,7 +1048,7 @@ const struct setting_type setting_type_dnssl __setting_type = { }; /** IPv4 DNS server setting */ -const struct setting dns_setting __setting ( SETTING_IP_EXTRA, dns ) = { +const struct setting dns_setting __setting ( SETTING_IP4_EXTRA, dns ) = { .name = "dns", .description = "DNS server", .tag = DHCP_DNS_SERVERS, @@ -1056,7 +1056,7 @@ const struct setting dns_setting __setting ( SETTING_IP_EXTRA, dns ) = { }; /** IPv6 DNS server setting */ -const struct setting dns6_setting __setting ( SETTING_IP_EXTRA, dns6 ) = { +const struct setting dns6_setting __setting ( SETTING_IP6_EXTRA, dns6 ) = { .name = "dns6", .description = "DNS server", .tag = DHCPV6_DNS_SERVERS, |