From 1ee6fbf29624b7a9933bfd18edbace5974a9811d Mon Sep 17 00:00:00 2001 From: EunBong Song Date: Tue, 28 Aug 2018 13:46:49 +0000 Subject: [PATCH] Merged in ebsong/fork-apps (pull request #152) Master * nettest: fix typo! NET_LOOPBACK -> CONFIG_NET_LOOPBACK Signed-off-by: EunBong Song * nettest: fix compilation error. Should enable NET_SETSOCKOPT for preventing compilation error. Signed-off-by: EunBong Song Approved-by: GregoryN --- examples/nettest/Kconfig | 1 + examples/nettest/nettest_cmdline.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/nettest/Kconfig b/examples/nettest/Kconfig index 3ea5d8d3c..6cd6da965 100644 --- a/examples/nettest/Kconfig +++ b/examples/nettest/Kconfig @@ -7,6 +7,7 @@ config EXAMPLES_NETTEST bool "Network test example" default n depends on NET_TCP + depends on NET_SOCKOPTS ---help--- Enable the network test example diff --git a/examples/nettest/nettest_cmdline.c b/examples/nettest/nettest_cmdline.c index 7ebe57b06..c54410e05 100644 --- a/examples/nettest/nettest_cmdline.c +++ b/examples/nettest/nettest_cmdline.c @@ -76,7 +76,7 @@ uint16_t g_nettestserver_ipv6[8] = #else -#if defined(CONFIG_EXAMPLES_NETTEST_LOOPBACK) && defined(NET_LOOPBACK) +#if defined(CONFIG_EXAMPLES_NETTEST_LOOPBACK) && defined(CONFIG_NET_LOOPBACK) uint32_t g_nettestserver_ipv4 = HTONL(0x7f000001); #else uint32_t g_nettestserver_ipv4 = HTONL(CONFIG_EXAMPLES_NETTEST_SERVERIP);