sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-13 15:31:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

[settings] Create space for IPv6 in settings display order

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2016-07-15 16:52:47 +01:00
parent c53a209a42
commit ecfc81d76f
4 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/ipv4.c
View File

@@ -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,

2
src/net/ndp.c
View File

@@ -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,

4
src/net/udp/dns.c
View File

@@ -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,