narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ipv6] Rename ipv6_scope to ipv6_settings_scope 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/56/head
Michael Brown 2016-07-21 15:46:51 +01:00
parent c34d1518eb
commit daa1a59310
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,7 +286,7 @@ struct builtin_setting {
extern const struct settings_scope builtin_scope; extern const struct settings_scope builtin_scope;
/** IPv6 setting scope */ /** IPv6 setting scope */
extern const struct settings_scope ipv6_scope; extern const struct settings_scope ipv6_settings_scope;
/** DHCPv6 setting scope */ /** DHCPv6 setting scope */
extern const struct settings_scope dhcpv6_scope; extern const struct settings_scope dhcpv6_scope;

12
src/net/ipv6.c
View File

@ -1040,14 +1040,14 @@ int format_ipv6_setting ( const struct setting_type *type __unused,
} }
/** IPv6 settings scope */ /** IPv6 settings scope */
const struct settings_scope ipv6_scope; const struct settings_scope ipv6_settings_scope;
/** IPv6 address setting */ /** IPv6 address setting */
const struct setting ip6_setting __setting ( SETTING_IP6, ip6 ) = { const struct setting ip6_setting __setting ( SETTING_IP6, ip6 ) = {
.name = "ip6", .name = "ip6",
.description = "IPv6 address", .description = "IPv6 address",
.type = &setting_type_ipv6, .type = &setting_type_ipv6,
.scope = &ipv6_scope, .scope = &ipv6_settings_scope,
}; };
/** IPv6 prefix length setting */ /** IPv6 prefix length setting */
@ -1055,7 +1055,7 @@ const struct setting len6_setting __setting ( SETTING_IP6, len6 ) = {
.name = "len6", .name = "len6",
.description = "IPv6 prefix length", .description = "IPv6 prefix length",
.type = &setting_type_int8, .type = &setting_type_int8,
.scope = &ipv6_scope, .scope = &ipv6_settings_scope,
}; };
/** Default gateway setting */ /** Default gateway setting */
@ -1063,7 +1063,7 @@ const struct setting gateway6_setting __setting ( SETTING_IP6, gateway6 ) = {
.name = "gateway6", .name = "gateway6",
.description = "IPv6 gateway", .description = "IPv6 gateway",
.type = &setting_type_ipv6, .type = &setting_type_ipv6,
.scope = &ipv6_scope, .scope = &ipv6_settings_scope,
}; };
/** /**
@ -1076,7 +1076,7 @@ const struct setting gateway6_setting __setting ( SETTING_IP6, gateway6 ) = {
static int ipv6_applies ( struct settings *settings __unused, static int ipv6_applies ( struct settings *settings __unused,
const struct setting *setting ) { const struct setting *setting ) {
return ( setting->scope == &ipv6_scope ); return ( setting->scope == &ipv6_settings_scope );
} }
/** /**
@ -1162,7 +1162,7 @@ static int ipv6_register_settings ( struct net_device *netdev ) {
} }
ref_init ( &ipv6set->refcnt, NULL ); ref_init ( &ipv6set->refcnt, NULL );
settings_init ( &ipv6set->settings, &ipv6_settings_operations, settings_init ( &ipv6set->settings, &ipv6_settings_operations,
&ipv6set->refcnt, &ipv6_scope ); &ipv6set->refcnt, &ipv6_settings_scope );
ipv6set->settings.order = IPV6_ORDER_LINK_LOCAL; ipv6set->settings.order = IPV6_ORDER_LINK_LOCAL;
/* Register settings */ /* Register settings */

2
src/net/ndp.c
View File

@ -755,7 +755,7 @@ static struct settings_operations ndp_settings_operations = {
static int ndp_prefix_applies ( struct settings *settings __unused, static int ndp_prefix_applies ( struct settings *settings __unused,
const struct setting *setting ) { const struct setting *setting ) {
return ( setting->scope == &ipv6_scope ); return ( setting->scope == &ipv6_settings_scope );
} }
/** /**