Browse Source

[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>
tags/v1.20.1
Michael Brown 8 years ago
parent
commit
129206f476
5 changed files with 8 additions and 8 deletions
  1. 1
    1
      src/core/settings.c
  2. 1
    1
      src/include/ipxe/settings.h
  3. 4
    4
      src/net/udp/dhcpv6.c
  4. 1
    1
      src/net/udp/dns.c
  5. 1
    1
      src/net/udp/syslog.c

+ 1
- 1
src/core/settings.c View File

1784
 };
1784
 };
1785
 
1785
 
1786
 /** IPv6 settings scope */
1786
 /** IPv6 settings scope */
1787
-const struct settings_scope ipv6_scope;
1787
+const struct settings_scope dhcpv6_scope;
1788
 
1788
 
1789
 /**
1789
 /**
1790
  * Integer setting type indices
1790
  * Integer setting type indices

+ 1
- 1
src/include/ipxe/settings.h View File

284
 extern const struct settings_scope builtin_scope;
284
 extern const struct settings_scope builtin_scope;
285
 
285
 
286
 /** IPv6 setting scope */
286
 /** IPv6 setting scope */
287
-extern const struct settings_scope ipv6_scope;
287
+extern const struct settings_scope dhcpv6_scope;
288
 
288
 
289
 /**
289
 /**
290
  * A generic settings block
290
  * A generic settings block

+ 4
- 4
src/net/udp/dhcpv6.c View File

280
 static int dhcpv6_applies ( struct settings *settings __unused,
280
 static int dhcpv6_applies ( struct settings *settings __unused,
281
 			    const struct setting *setting ) {
281
 			    const struct setting *setting ) {
282
 
282
 
283
-	return ( setting->scope == &ipv6_scope );
283
+	return ( setting->scope == &dhcpv6_scope );
284
 }
284
 }
285
 
285
 
286
 /**
286
 /**
341
 	}
341
 	}
342
 	ref_init ( &dhcpv6set->refcnt, NULL );
342
 	ref_init ( &dhcpv6set->refcnt, NULL );
343
 	settings_init ( &dhcpv6set->settings, &dhcpv6_settings_operations,
343
 	settings_init ( &dhcpv6set->settings, &dhcpv6_settings_operations,
344
-			&dhcpv6set->refcnt, &ipv6_scope );
344
+			&dhcpv6set->refcnt, &dhcpv6_scope );
345
 	data = ( ( ( void * ) dhcpv6set ) + sizeof ( *dhcpv6set ) );
345
 	data = ( ( ( void * ) dhcpv6set ) + sizeof ( *dhcpv6set ) );
346
 	len = options->len;
346
 	len = options->len;
347
 	memcpy ( data, options->data, len );
347
 	memcpy ( data, options->data, len );
987
 	.description = "Boot filename",
987
 	.description = "Boot filename",
988
 	.tag = DHCPV6_BOOTFILE_URL,
988
 	.tag = DHCPV6_BOOTFILE_URL,
989
 	.type = &setting_type_string,
989
 	.type = &setting_type_string,
990
-	.scope = &ipv6_scope,
990
+	.scope = &dhcpv6_scope,
991
 };
991
 };
992
 
992
 
993
 /** DNS search list setting */
993
 /** DNS search list setting */
996
 	.description = "DNS search list",
996
 	.description = "DNS search list",
997
 	.tag = DHCPV6_DOMAIN_LIST,
997
 	.tag = DHCPV6_DOMAIN_LIST,
998
 	.type = &setting_type_dnssl,
998
 	.type = &setting_type_dnssl,
999
-	.scope = &ipv6_scope,
999
+	.scope = &dhcpv6_scope,
1000
 };
1000
 };

+ 1
- 1
src/net/udp/dns.c View File

1061
 	.description = "DNS server",
1061
 	.description = "DNS server",
1062
 	.tag = DHCPV6_DNS_SERVERS,
1062
 	.tag = DHCPV6_DNS_SERVERS,
1063
 	.type = &setting_type_ipv6,
1063
 	.type = &setting_type_ipv6,
1064
-	.scope = &ipv6_scope,
1064
+	.scope = &dhcpv6_scope,
1065
 };
1065
 };
1066
 
1066
 
1067
 /** DNS search list */
1067
 /** DNS search list */

+ 1
- 1
src/net/udp/syslog.c View File

213
 	.description = "Syslog server",
213
 	.description = "Syslog server",
214
 	.tag = DHCPV6_LOG_SERVERS,
214
 	.tag = DHCPV6_LOG_SERVERS,
215
 	.type = &setting_type_ipv6,
215
 	.type = &setting_type_ipv6,
216
-	.scope = &ipv6_scope,
216
+	.scope = &dhcpv6_scope,
217
 };
217
 };
218
 
218
 
219
 /**
219
 /**

Loading…
Cancel
Save