diff options
| author | Michael Brown | 2010-12-01 17:34:23 +0100 |
|---|---|---|
| committer | Michael Brown | 2010-12-01 17:35:00 +0100 |
| commit | 67b45186a572fb051e73fd88d4fc580a0d4d2f6b (patch) | |
| tree | 9c1b23f9ceab3f9e9bf3ca0563103bc6230c0ee5 /src/net/udp/dhcp.c | |
| parent | [iscsi] Disambiguate the common EINVAL cases (diff) | |
| download | ipxe-67b45186a572fb051e73fd88d4fc580a0d4d2f6b.tar.gz ipxe-67b45186a572fb051e73fd88d4fc580a0d4d2f6b.tar.xz ipxe-67b45186a572fb051e73fd88d4fc580a0d4d2f6b.zip | |
[settings] Apply settings block name in register_settings()
Pass the settings block name as a parameter to register_settings(),
rather than defining it with settings_init() (and then possibly
changing it by directly manipulating settings->name).
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/net/udp/dhcp.c')
| -rw-r--r-- | src/net/udp/dhcp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index 443ae3aa..0524385a 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.c @@ -553,7 +553,8 @@ static void dhcp_request_rx ( struct dhcp_session *dhcp, /* Register settings */ parent = netdev_settings ( dhcp->netdev ); settings = &dhcppkt->settings; - if ( ( rc = register_settings ( settings, parent ) ) != 0 ) { + if ( ( rc = register_settings ( settings, parent, + DHCP_SETTINGS_NAME ) ) != 0 ) { DBGC ( dhcp, "DHCP %p could not register settings: %s\n", dhcp, strerror ( rc ) ); dhcp_finished ( dhcp, rc ); @@ -568,9 +569,8 @@ static void dhcp_request_rx ( struct dhcp_session *dhcp, * without performing a ProxyDHCPREQUEST */ settings = &dhcp->proxy_offer->settings; - settings->name = PROXYDHCP_SETTINGS_NAME; - if ( ( rc = register_settings ( settings, - NULL ) ) != 0 ) { + if ( ( rc = register_settings ( settings, NULL, + PROXYDHCP_SETTINGS_NAME ) ) != 0 ) { DBGC ( dhcp, "DHCP %p could not register " "proxy settings: %s\n", dhcp, strerror ( rc ) ); @@ -670,8 +670,8 @@ static void dhcp_proxy_rx ( struct dhcp_session *dhcp, return; /* Register settings */ - settings->name = PROXYDHCP_SETTINGS_NAME; - if ( ( rc = register_settings ( settings, NULL ) ) != 0 ) { + if ( ( rc = register_settings ( settings, NULL, + PROXYDHCP_SETTINGS_NAME ) ) != 0 ) { DBGC ( dhcp, "DHCP %p could not register proxy settings: %s\n", dhcp, strerror ( rc ) ); dhcp_finished ( dhcp, rc ); @@ -809,8 +809,8 @@ static void dhcp_pxebs_rx ( struct dhcp_session *dhcp, return; /* Register settings */ - dhcppkt->settings.name = PXEBS_SETTINGS_NAME; - if ( ( rc = register_settings ( &dhcppkt->settings, NULL ) ) != 0 ) { + if ( ( rc = register_settings ( &dhcppkt->settings, NULL, + PXEBS_SETTINGS_NAME ) ) != 0 ) { DBGC ( dhcp, "DHCP %p could not register settings: %s\n", dhcp, strerror ( rc ) ); dhcp_finished ( dhcp, rc ); |