From 011d45e956603a36f7036dca6ae1358f40469c80 Mon Sep 17 00:00:00 2001
From: SPRESENSE <41312067+SPRESENSE@users.noreply.github.com>
Date: Tue, 27 Jun 2023 12:11:38 +0900
Subject: [PATCH] net/usrsock: Can enable TCP/UDP IP stack with Usrsock enabled

Some use cases, such as VPN, use both the device's network
stack with the Usrsock daemon and the Kernel's network stack.
Therefore, remove NET_TCP_NO_STACK/NET_UDP_NO_STACK select
from Usrsock's Kconfig.
---
 net/tcp/Kconfig     | 2 +-
 net/udp/Kconfig     | 2 +-
 net/usrsock/Kconfig | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/tcp/Kconfig b/net/tcp/Kconfig
index 290cbb41bd..a6b98c4198 100644
--- a/net/tcp/Kconfig
+++ b/net/tcp/Kconfig
@@ -14,7 +14,7 @@ config NET_TCP
 
 config NET_TCP_NO_STACK
 	bool "Disable TCP/IP Stack"
-	default n
+	default NET_USRSOCK_TCP if NET_USRSOCK
 	select NET_TCP
 	---help---
 		Build without TCP/IP stack even if TCP networking support enabled.
diff --git a/net/udp/Kconfig b/net/udp/Kconfig
index e702423de3..e147b7a608 100644
--- a/net/udp/Kconfig
+++ b/net/udp/Kconfig
@@ -15,7 +15,7 @@ config NET_UDP
 
 config NET_UDP_NO_STACK
 	bool "Disable UDP/IP Stack"
-	default n
+	default NET_USRSOCK_UDP if NET_USRSOCK
 	select NET_UDP
 	---help---
 		Build without UDP/IP stack even if UDP networking support enabled.
diff --git a/net/usrsock/Kconfig b/net/usrsock/Kconfig
index 1ce47e40fe..7783eed40e 100644
--- a/net/usrsock/Kconfig
+++ b/net/usrsock/Kconfig
@@ -76,12 +76,10 @@ config NET_USRSOCK_NPOLLWAITERS
 config NET_USRSOCK_UDP
 	bool "User-space daemon provides UDP sockets"
 	default n
-	select NET_UDP_NO_STACK
 
 config NET_USRSOCK_TCP
 	bool "User-space daemon provides TCP sockets"
 	default n
-	select NET_TCP_NO_STACK
 
 config NET_USRSOCK_ICMP
 	bool "User-space daemon provides ICMP sockets"