diff --git a/examples/README.txt b/examples/README.txt index be97000ea..23f4cfbcb 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -249,9 +249,6 @@ examples/dhcpd CONFIG_NETUTILS_NETLIB=y - The networking library is needed CONFIG_EXAMPLES_DHCPD_NOMAC - (May be defined to use software assigned MAC) - CONFIG_EXAMPLES_DHCPD_IPADDR - Target IP address - CONFIG_EXAMPLES_DHCPD_DRIPADDR - Default router IP address - CONFIG_EXAMPLES_DHCPD_NETMASK - Network mask See also CONFIG_NETUTILS_DHCPD_* settings described elsewhere and used in netutils/dhcpd/dhcpd.c. These settings are required diff --git a/examples/dhcpd/Kconfig b/examples/dhcpd/Kconfig index 070451ff0..c3b767163 100644 --- a/examples/dhcpd/Kconfig +++ b/examples/dhcpd/Kconfig @@ -15,16 +15,4 @@ config EXAMPLES_DHCPD_NOMAC bool "Use Canned MAC Address" default n -config EXAMPLES_DHCPD_IPADDR - hex "Target IP address" - default 0x0a000002 - -config EXAMPLES_DHCPD_DRIPADDR - hex "Default Router IP address (Gateway)" - default 0x0a000001 - -config EXAMPLES_DHCPD_NETMASK - hex "Network Mask" - default 0xffffff00 - endif diff --git a/examples/dhcpd/dhcpd_daemon.c b/examples/dhcpd/dhcpd_daemon.c index 4f5568641..332ba75b4 100644 --- a/examples/dhcpd/dhcpd_daemon.c +++ b/examples/dhcpd/dhcpd_daemon.c @@ -44,18 +44,6 @@ * but there are default values for those so we cannot check them here. */ -#ifndef CONFIG_EXAMPLES_DHCPD_IPADDR -# error "You must define CONFIG_EXAMPLES_DHCPD_IPADDR" -#endif - -#ifndef CONFIG_EXAMPLES_DHCPD_DRIPADDR -# error "You must define CONFIG_EXAMPLES_DHCPD_DRIPADDR" -#endif - -#ifndef CONFIG_EXAMPLES_DHCPD_NETMASK -# error "You must define CONFIG_EXAMPLES_DHCPD_NETMASK" -#endif - #ifndef CONFIG_NET # error "You must define CONFIG_NET" #endif @@ -122,17 +110,17 @@ int dhcpd_daemon(int argc, FAR char *argv[], bool daemon) /* Set up our host address */ - addr.s_addr = HTONL(CONFIG_EXAMPLES_DHCPD_IPADDR); + addr.s_addr = HTONL(CONFIG_NETUTILS_DHCPD_ROUTERIP); netlib_set_ipv4addr(devname, &addr); /* Set up the default router address */ - addr.s_addr = HTONL(CONFIG_EXAMPLES_DHCPD_DRIPADDR); + addr.s_addr = HTONL(CONFIG_NETUTILS_DHCPD_ROUTERIP); netlib_set_dripv4addr(devname, &addr); /* Setup the subnet mask */ - addr.s_addr = HTONL(CONFIG_EXAMPLES_DHCPD_NETMASK); + addr.s_addr = HTONL(CONFIG_NETUTILS_DHCPD_NETMASK); netlib_set_ipv4netmask(devname, &addr); /* New versions of netlib_set_ipvXaddr will not bring the network up,