From daa1a59310c0ae05773ac7f81417dfeebeb1455b Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 21 Jul 2016 15:46:51 +0100 Subject: [PATCH] [ipv6] Rename ipv6_scope to ipv6_settings_scope Signed-off-by: Michael Brown --- src/include/ipxe/settings.h | 2 +- src/net/ipv6.c | 12 ++++++------ src/net/ndp.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/include/ipxe/settings.h b/src/include/ipxe/settings.h index 8cc0b6bb..341fc3c7 100644 --- a/src/include/ipxe/settings.h +++ b/src/include/ipxe/settings.h @@ -286,7 +286,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 ipv6_settings_scope; /** DHCPv6 setting scope */ extern const struct settings_scope dhcpv6_scope; diff --git a/src/net/ipv6.c b/src/net/ipv6.c index d2a17312..c4e1f708 100644 --- a/src/net/ipv6.c +++ b/src/net/ipv6.c @@ -1040,14 +1040,14 @@ int format_ipv6_setting ( const struct setting_type *type __unused, } /** IPv6 settings scope */ -const struct settings_scope ipv6_scope; +const struct settings_scope ipv6_settings_scope; /** IPv6 address setting */ const struct setting ip6_setting __setting ( SETTING_IP6, ip6 ) = { .name = "ip6", .description = "IPv6 address", .type = &setting_type_ipv6, - .scope = &ipv6_scope, + .scope = &ipv6_settings_scope, }; /** IPv6 prefix length setting */ @@ -1055,7 +1055,7 @@ const struct setting len6_setting __setting ( SETTING_IP6, len6 ) = { .name = "len6", .description = "IPv6 prefix length", .type = &setting_type_int8, - .scope = &ipv6_scope, + .scope = &ipv6_settings_scope, }; /** Default gateway setting */ @@ -1063,7 +1063,7 @@ const struct setting gateway6_setting __setting ( SETTING_IP6, gateway6 ) = { .name = "gateway6", .description = "IPv6 gateway", .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, 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 ); settings_init ( &ipv6set->settings, &ipv6_settings_operations, - &ipv6set->refcnt, &ipv6_scope ); + &ipv6set->refcnt, &ipv6_settings_scope ); ipv6set->settings.order = IPV6_ORDER_LINK_LOCAL; /* Register settings */ diff --git a/src/net/ndp.c b/src/net/ndp.c index 21bbd999..f28e71cb 100644 --- a/src/net/ndp.c +++ b/src/net/ndp.c @@ -755,7 +755,7 @@ static struct settings_operations ndp_settings_operations = { static int ndp_prefix_applies ( struct settings *settings __unused, const struct setting *setting ) { - return ( setting->scope == &ipv6_scope ); + return ( setting->scope == &ipv6_settings_scope ); } /**