From 3a65d39eb8209a7679b02cc98e03063a2154adec Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Fri, 14 Sep 2018 07:18:37 -0600 Subject: [PATCH] net/usrsock: Revert 'net/usrsock: Optimize option dependence', commit 42f7c3e927059ad8f13c554ddf848e0bcfb3162c. Re-allow combination of usrsock and NuttX TCP/IP stack. For example, in case device has Ethernet and mobile connectivity and NuttX TCP/IP stack is used when configured to use Ethernet connection and usrsock when configured to use modem (modem TCP/IP stack through usrsock). --- net/inet/inet_sockif.c | 4 ---- net/usrsock/Kconfig | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/net/inet/inet_sockif.c b/net/inet/inet_sockif.c index 87cb2bdba86..1078ec79d11 100644 --- a/net/inet/inet_sockif.c +++ b/net/inet/inet_sockif.c @@ -62,8 +62,6 @@ * Private Function Prototypes ****************************************************************************/ -#if defined(NET_UDP_HAVE_STACK) || defined(NET_TCP_HAVE_STACK) - static int inet_setup(FAR struct socket *psock, int protocol); static sockcaps_t inet_sockcaps(FAR struct socket *psock); static void inet_addref(FAR struct socket *psock); @@ -1291,8 +1289,6 @@ static ssize_t inet_sendfile(FAR struct socket *psock, } #endif -#endif /* NET_UDP_HAVE_STACK || NET_TCP_HAVE_STACK */ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/net/usrsock/Kconfig b/net/usrsock/Kconfig index 28087330ae1..0d965dab352 100644 --- a/net/usrsock/Kconfig +++ b/net/usrsock/Kconfig @@ -36,13 +36,13 @@ config NET_USRSOCK_NO_INET6 config NET_USRSOCK_UDP bool "User-space daemon provides UDP sockets" default n - select NET_UDP_NO_STACK + select NET_UDP ---help--- config NET_USRSOCK_TCP bool "User-space daemon provides TCP sockets" default n - select NET_TCP_NO_STACK + select NET_TCP ---help--- config NET_USRSOCK_OTHER