From 4484edd1c0bd4f62c75f0db517e2747039816e4c Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 8 Nov 2013 15:52:56 +0000 Subject: [PATCH] [settings] Move user-class setting from dhcp.c to settings.c Signed-off-by: Michael Brown --- src/core/settings.c | 8 ++++++++ src/include/ipxe/settings.h | 1 + src/net/udp/dhcp.c | 8 -------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/core/settings.c b/src/core/settings.c index 0fe8b2eb..03ef084a 100644 --- 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 4f161072..a7f76cf9 100644 --- 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 60d65c47..66bcc83a 100644 --- 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 *