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

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/core/settings.c b/src/core/settings.c
index 0fe8b2ebf496a7b85cc2fbba81e8194b2beaf350..03ef084aff1dbba8890548f4f9a4720a8e3438d7 100644 (file)
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -2240,6 +2240,14 @@ struct setting priority_setting __setting ( SETTING_MISC ) = {
        .type = &setting_type_int8,
 };
 
+/** DHCP user class setting */
+struct setting user_class_setting __setting ( SETTING_HOST_EXTRA ) = {
+       .name = "user-class",
+       .description = "DHCP user class",
+       .tag = DHCP_USER_CLASS_ID,
+       .type = &setting_type_string,
+};
+
 /******************************************************************************
  *
  * Built-in settings block

diff --git a/src/include/ipxe/settings.h b/src/include/ipxe/settings.h
index 4f16107202ad1cbafabfb00f671a0ec8735f640a..a7f76cf9d8166711ebc8934541debb3384e2cd92 100644 (file)
--- a/src/include/ipxe/settings.h
+++ b/src/include/ipxe/settings.h
@@ -404,6 +404,7 @@ extern struct setting uuid_setting __setting ( SETTING_HOST );
 extern struct setting next_server_setting __setting ( SETTING_BOOT );
 extern struct setting mac_setting __setting ( SETTING_NETDEV );
 extern struct setting busid_setting __setting ( SETTING_NETDEV );
+extern struct setting user_class_setting __setting ( SETTING_HOST_EXTRA );
 
 /**
  * Initialise a settings block

diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index 60d65c4729b1b731c95399597751152050dc0e0c..66bcc83ae6fe912d1641e3b01c601d207b67f15a 100644 (file)
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -99,14 +99,6 @@ struct setting dhcp_server_setting __setting ( SETTING_MISC ) = {
        .type = &setting_type_ipv4,
 };
 
-/** DHCP user class setting */
-struct setting user_class_setting __setting ( SETTING_HOST_EXTRA ) = {
-       .name = "user-class",
-       .description = "DHCP user class",
-       .tag = DHCP_USER_CLASS_ID,
-       .type = &setting_type_string,
-};
-
 /**
  * Most recent DHCP transaction ID
  *