diff options
| author | Michael Brown | 2016-07-16 13:42:08 +0200 |
|---|---|---|
| committer | Michael Brown | 2016-07-16 13:42:08 +0200 |
| commit | 129206f476262b8b071135d0a1e020811472dc78 (patch) | |
| tree | d4e240c4918fe2553b94f3396aa68d3c12cd677d /src/net | |
| parent | [settings] Create space for IPv6 in settings display order (diff) | |
| download | ipxe-129206f476262b8b071135d0a1e020811472dc78.tar.gz ipxe-129206f476262b8b071135d0a1e020811472dc78.tar.xz ipxe-129206f476262b8b071135d0a1e020811472dc78.zip | |
[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>
Diffstat (limited to 'src/net')
| -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 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/net/udp/dhcpv6.c b/src/net/udp/dhcpv6.c index be1ed4ec..f57ea7b8 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 5a9836cb..e849472d 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 b6eee603..a45fc459 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, }; /** |