diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/settings.c | 2 | ||||
| -rw-r--r-- | src/include/ipxe/settings.h | 2 | ||||
| -rw-r--r-- | src/net/udp/dhcpv6.c | 8 | ||||
| -rw-r--r-- | src/net/udp/dns.c | 2 | ||||
| -rw-r--r-- | src/net/udp/syslog.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/core/settings.c b/src/core/settings.c index 9cae0cae3..1361a10ed 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -1784,7 +1784,7 @@ const struct setting_type setting_type_ipv6 __setting_type = { }; /** IPv6 settings scope */ -const struct settings_scope ipv6_scope; +const struct settings_scope dhcpv6_scope; /** * Integer setting type indices diff --git a/src/include/ipxe/settings.h b/src/include/ipxe/settings.h index 29853edc4..64ffe655b 100644 --- a/src/include/ipxe/settings.h +++ b/src/include/ipxe/settings.h @@ -284,7 +284,7 @@ struct builtin_setting { extern const struct settings_scope builtin_scope; /** IPv6 setting scope */ -extern const struct settings_scope ipv6_scope; +extern const struct settings_scope dhcpv6_scope; /** * A generic settings block diff --git a/src/net/udp/dhcpv6.c b/src/net/udp/dhcpv6.c index be1ed4ec0..f57ea7b8a 100644 --- a/src/net/udp/dhcpv6.c +++ b/src/net/udp/dhcpv6.c @@ -280,7 +280,7 @@ struct dhcpv6_settings { static int dhcpv6_applies ( struct settings *settings __unused, const struct setting *setting ) { - return ( setting->scope == &ipv6_scope ); + return ( setting->scope == &dhcpv6_scope ); } /** @@ -341,7 +341,7 @@ static int dhcpv6_register ( struct dhcpv6_option_list *options, } ref_init ( &dhcpv6set->refcnt, NULL ); settings_init ( &dhcpv6set->settings, &dhcpv6_settings_operations, - &dhcpv6set->refcnt, &ipv6_scope ); + &dhcpv6set->refcnt, &dhcpv6_scope ); data = ( ( ( void * ) dhcpv6set ) + sizeof ( *dhcpv6set ) ); len = options->len; memcpy ( data, options->data, len ); @@ -987,7 +987,7 @@ const struct setting filename6_setting __setting ( SETTING_BOOT, filename ) = { .description = "Boot filename", .tag = DHCPV6_BOOTFILE_URL, .type = &setting_type_string, - .scope = &ipv6_scope, + .scope = &dhcpv6_scope, }; /** DNS search list setting */ @@ -996,5 +996,5 @@ const struct setting dnssl6_setting __setting ( SETTING_IP_EXTRA, dnssl ) = { .description = "DNS search list", .tag = DHCPV6_DOMAIN_LIST, .type = &setting_type_dnssl, - .scope = &ipv6_scope, + .scope = &dhcpv6_scope, }; diff --git a/src/net/udp/dns.c b/src/net/udp/dns.c index 5a9836cb2..e849472de 100644 --- a/src/net/udp/dns.c +++ b/src/net/udp/dns.c @@ -1061,7 +1061,7 @@ const struct setting dns6_setting __setting ( SETTING_IP6_EXTRA, dns6 ) = { .description = "DNS server", .tag = DHCPV6_DNS_SERVERS, .type = &setting_type_ipv6, - .scope = &ipv6_scope, + .scope = &dhcpv6_scope, }; /** DNS search list */ diff --git a/src/net/udp/syslog.c b/src/net/udp/syslog.c index b6eee6036..a45fc459d 100644 --- a/src/net/udp/syslog.c +++ b/src/net/udp/syslog.c @@ -213,7 +213,7 @@ const struct setting syslog6_setting __setting ( SETTING_MISC, syslog6 ) = { .description = "Syslog server", .tag = DHCPV6_LOG_SERVERS, .type = &setting_type_ipv6, - .scope = &ipv6_scope, + .scope = &dhcpv6_scope, }; /** |