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

diff --git a/src/core/settings.c b/src/core/settings.c
index 9cae0cae3746cc8692b39e26cabbaece02964337..1361a10ed255fee68ed2a7f239d26a07958d7702 100644 (file)
--- 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 29853edc4eafb7a3a89dac881fcf6e745dd9c6dc..64ffe655baeeeae0a0f813d928c76f88f4bc6953 100644 (file)
--- 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 be1ed4ec0ab58d40f36467073d57b2c2ed96df47..f57ea7b8af66b5299fd8dfc7b72f31699335037c 100644 (file)
--- 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 5a9836cb29f67283d82c3778d7742c2af0be0413..e849472defa368277a31919fa501546711305d13 100644 (file)
--- 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 b6eee6036ce870d211cb7f17d0247270e9c9a29c..a45fc459dc76260ce2a5bd56f8e3459eab350737 100644 (file)
--- 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,
 };
 
 /**