summaryrefslogtreecommitdiffstats
path: root/src/net/dhcpopts.c
diff options
context:
space:
mode:
authorMichael Brown2007-11-21 05:48:18 +0100
committerMichael Brown2007-11-21 05:48:18 +0100
commitfb809da2dfe9d715a02de7033ede46854d176c2e (patch)
tree78b7f6462aa74a4ebc9f243c69bf2c41676d0714 /src/net/dhcpopts.c
parentAdd PXE-required DHCP options to DHCPDISCOVER and DHCPREQUEST packets. (diff)
downloadipxe-fb809da2dfe9d715a02de7033ede46854d176c2e.tar.gz
ipxe-fb809da2dfe9d715a02de7033ede46854d176c2e.tar.xz
ipxe-fb809da2dfe9d715a02de7033ede46854d176c2e.zip
Remove some assumptions about DHCP obtaining only a single options block.
Diffstat (limited to 'src/net/dhcpopts.c')
-rw-r--r--src/net/dhcpopts.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net/dhcpopts.c b/src/net/dhcpopts.c
index c713909e..d1837be3 100644
--- a/src/net/dhcpopts.c
+++ b/src/net/dhcpopts.c
@@ -35,7 +35,7 @@
*/
/** List of registered DHCP option blocks */
-static LIST_HEAD ( option_blocks );
+LIST_HEAD ( dhcp_option_blocks );
/** Registered DHCP option applicators */
static struct dhcp_option_applicator dhcp_option_applicators[0]
@@ -259,7 +259,7 @@ struct dhcp_option * find_dhcp_option ( struct dhcp_option_block *options,
if ( options ) {
return find_dhcp_option_with_encap ( options, tag, NULL );
} else {
- list_for_each_entry ( options, &option_blocks, list ) {
+ list_for_each_entry ( options, &dhcp_option_blocks, list ) {
if ( ( option = find_dhcp_option ( options, tag ) ) )
return option;
}
@@ -283,7 +283,7 @@ void register_dhcp_options ( struct dhcp_option_block *options ) {
options, options->priority );
/* Insert after any existing blocks which have a higher priority */
- list_for_each_entry ( existing, &option_blocks, list ) {
+ list_for_each_entry ( existing, &dhcp_option_blocks, list ) {
if ( options->priority > existing->priority )
break;
}