diff options
| author | Michael Brown | 2007-07-06 18:07:50 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-07-06 18:07:50 +0200 |
| commit | 934b70d62c7cd9835b2b8682f665277e1e1259e1 (patch) | |
| tree | 3d83d4e2f2cb922f95dc93dee0166083d367fa32 /src/net/udp/dhcp.c | |
| parent | Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe (diff) | |
| download | ipxe-934b70d62c7cd9835b2b8682f665277e1e1259e1.tar.gz ipxe-934b70d62c7cd9835b2b8682f665277e1e1259e1.tar.xz ipxe-934b70d62c7cd9835b2b8682f665277e1e1259e1.zip | |
Apply global DHCP options when register_dhcp_options() is called. Do
not apply DHCP options in dhcp_configure_netdev().
Diffstat (limited to 'src/net/udp/dhcp.c')
| -rw-r--r-- | src/net/udp/dhcp.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index a8cb9376..81454b06 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.c @@ -855,12 +855,5 @@ int dhcp_configure_netdev ( struct net_device *netdev, return rc; } - /* Apply other DHCP options */ - if ( ( rc = apply_dhcp_options ( options ) ) != 0 ) { - DBG ( "Could not apply %s DHCP result options: %s\n", - netdev->name, strerror ( rc ) ); - return rc; - } - return 0; } |