david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[ipv6] Rename ipv6_scope to dhcpv6_scope 

The settings scope ipv6_scope refers specifically to IPv6 settings
that have a corresponding DHCPv6 option.  Rename to dhcpv6_scope to
more accurately reflect this purpose.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2016-07-16 12:42:08 +01:00
parent ecfc81d76f
commit 129206f476
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/settings.c
View File

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

2
src/include/ipxe/settings.h
View File

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

8
src/net/udp/dhcpv6.c
View File

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

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

@ -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 */

2
src/net/udp/syslog.c
View File

@ -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,
};
/**