Apply global DHCP options when register_dhcp_options() is called. Do

not apply DHCP options in dhcp_configure_netdev().
This commit is contained in:
Michael Brown
2007-07-06 17:07:50 +01:00
parent 311637503d
commit 934b70d62c
3 changed files with 13 additions and 7 deletions

View File

@@ -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;
}