Browse Source

[ipv6] Rename ipv6_scope to ipv6_settings_scope

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 8 years ago
parent
commit
daa1a59310
3 changed files with 8 additions and 8 deletions
  1. 1
    1
      src/include/ipxe/settings.h
  2. 6
    6
      src/net/ipv6.c
  3. 1
    1
      src/net/ndp.c

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

286
 extern const struct settings_scope builtin_scope;
286
 extern const struct settings_scope builtin_scope;
287
 
287
 
288
 /** IPv6 setting scope */
288
 /** IPv6 setting scope */
289
-extern const struct settings_scope ipv6_scope;
289
+extern const struct settings_scope ipv6_settings_scope;
290
 
290
 
291
 /** DHCPv6 setting scope */
291
 /** DHCPv6 setting scope */
292
 extern const struct settings_scope dhcpv6_scope;
292
 extern const struct settings_scope dhcpv6_scope;

+ 6
- 6
src/net/ipv6.c View File

1040
 }
1040
 }
1041
 
1041
 
1042
 /** IPv6 settings scope */
1042
 /** IPv6 settings scope */
1043
-const struct settings_scope ipv6_scope;
1043
+const struct settings_scope ipv6_settings_scope;
1044
 
1044
 
1045
 /** IPv6 address setting */
1045
 /** IPv6 address setting */
1046
 const struct setting ip6_setting __setting ( SETTING_IP6, ip6 ) = {
1046
 const struct setting ip6_setting __setting ( SETTING_IP6, ip6 ) = {
1047
 	.name = "ip6",
1047
 	.name = "ip6",
1048
 	.description = "IPv6 address",
1048
 	.description = "IPv6 address",
1049
 	.type = &setting_type_ipv6,
1049
 	.type = &setting_type_ipv6,
1050
-	.scope = &ipv6_scope,
1050
+	.scope = &ipv6_settings_scope,
1051
 };
1051
 };
1052
 
1052
 
1053
 /** IPv6 prefix length setting */
1053
 /** IPv6 prefix length setting */
1055
 	.name = "len6",
1055
 	.name = "len6",
1056
 	.description = "IPv6 prefix length",
1056
 	.description = "IPv6 prefix length",
1057
 	.type = &setting_type_int8,
1057
 	.type = &setting_type_int8,
1058
-	.scope = &ipv6_scope,
1058
+	.scope = &ipv6_settings_scope,
1059
 };
1059
 };
1060
 
1060
 
1061
 /** Default gateway setting */
1061
 /** Default gateway setting */
1063
 	.name = "gateway6",
1063
 	.name = "gateway6",
1064
 	.description = "IPv6 gateway",
1064
 	.description = "IPv6 gateway",
1065
 	.type = &setting_type_ipv6,
1065
 	.type = &setting_type_ipv6,
1066
-	.scope = &ipv6_scope,
1066
+	.scope = &ipv6_settings_scope,
1067
 };
1067
 };
1068
 
1068
 
1069
 /**
1069
 /**
1076
 static int ipv6_applies ( struct settings *settings __unused,
1076
 static int ipv6_applies ( struct settings *settings __unused,
1077
 			  const struct setting *setting ) {
1077
 			  const struct setting *setting ) {
1078
 
1078
 
1079
-	return ( setting->scope == &ipv6_scope );
1079
+	return ( setting->scope == &ipv6_settings_scope );
1080
 }
1080
 }
1081
 
1081
 
1082
 /**
1082
 /**
1162
 	}
1162
 	}
1163
 	ref_init ( &ipv6set->refcnt, NULL );
1163
 	ref_init ( &ipv6set->refcnt, NULL );
1164
 	settings_init ( &ipv6set->settings, &ipv6_settings_operations,
1164
 	settings_init ( &ipv6set->settings, &ipv6_settings_operations,
1165
-			&ipv6set->refcnt, &ipv6_scope );
1165
+			&ipv6set->refcnt, &ipv6_settings_scope );
1166
 	ipv6set->settings.order = IPV6_ORDER_LINK_LOCAL;
1166
 	ipv6set->settings.order = IPV6_ORDER_LINK_LOCAL;
1167
 
1167
 
1168
 	/* Register settings */
1168
 	/* Register settings */

+ 1
- 1
src/net/ndp.c View File

755
 static int ndp_prefix_applies ( struct settings *settings __unused,
755
 static int ndp_prefix_applies ( struct settings *settings __unused,
756
 				const struct setting *setting ) {
756
 				const struct setting *setting ) {
757
 
757
 
758
-	return ( setting->scope == &ipv6_scope );
758
+	return ( setting->scope == &ipv6_settings_scope );
759
 }
759
 }
760
 
760
 
761
 /**
761
 /**

Loading…
Cancel
Save