Преглед на файлове

[settings] Move user-class setting from dhcp.c to settings.c

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown преди 11 години
родител
ревизия
4484edd1c0
променени са 3 файла, в които са добавени 9 реда и са изтрити 8 реда
  1. 8
    0
      src/core/settings.c
  2. 1
    0
      src/include/ipxe/settings.h
  3. 0
    8
      src/net/udp/dhcp.c

+ 8
- 0
src/core/settings.c Целия файл

@@ -2240,6 +2240,14 @@ struct setting priority_setting __setting ( SETTING_MISC ) = {
2240 2240
 	.type = &setting_type_int8,
2241 2241
 };
2242 2242
 
2243
+/** DHCP user class setting */
2244
+struct setting user_class_setting __setting ( SETTING_HOST_EXTRA ) = {
2245
+	.name = "user-class",
2246
+	.description = "DHCP user class",
2247
+	.tag = DHCP_USER_CLASS_ID,
2248
+	.type = &setting_type_string,
2249
+};
2250
+
2243 2251
 /******************************************************************************
2244 2252
  *
2245 2253
  * Built-in settings block

+ 1
- 0
src/include/ipxe/settings.h Целия файл

@@ -404,6 +404,7 @@ extern struct setting uuid_setting __setting ( SETTING_HOST );
404 404
 extern struct setting next_server_setting __setting ( SETTING_BOOT );
405 405
 extern struct setting mac_setting __setting ( SETTING_NETDEV );
406 406
 extern struct setting busid_setting __setting ( SETTING_NETDEV );
407
+extern struct setting user_class_setting __setting ( SETTING_HOST_EXTRA );
407 408
 
408 409
 /**
409 410
  * Initialise a settings block

+ 0
- 8
src/net/udp/dhcp.c Целия файл

@@ -99,14 +99,6 @@ struct setting dhcp_server_setting __setting ( SETTING_MISC ) = {
99 99
 	.type = &setting_type_ipv4,
100 100
 };
101 101
 
102
-/** DHCP user class setting */
103
-struct setting user_class_setting __setting ( SETTING_HOST_EXTRA ) = {
104
-	.name = "user-class",
105
-	.description = "DHCP user class",
106
-	.tag = DHCP_USER_CLASS_ID,
107
-	.type = &setting_type_string,
108
-};
109
-
110 102
 /**
111 103
  * Most recent DHCP transaction ID
112 104
  *

Loading…
Отказ
Запис