diff options
| author | Michael Brown | 2016-07-21 16:46:51 +0200 |
|---|---|---|
| committer | Michael Brown | 2016-07-21 16:47:45 +0200 |
| commit | daa1a59310c0ae05773ac7f81417dfeebeb1455b (patch) | |
| tree | 512a39a80622eb59fe31709765c6b114f3238d97 /src/net/ipv6.c | |
| parent | [ipv6] Create routing table based on IPv6 settings (diff) | |
| download | ipxe-daa1a59310c0ae05773ac7f81417dfeebeb1455b.tar.gz ipxe-daa1a59310c0ae05773ac7f81417dfeebeb1455b.tar.xz ipxe-daa1a59310c0ae05773ac7f81417dfeebeb1455b.zip | |
[ipv6] Rename ipv6_scope to ipv6_settings_scope
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/net/ipv6.c')
| -rw-r--r-- | src/net/ipv6.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 */ |