mirror of
https://github.com/apache/nuttx.git
synced 2026-09-22 22:55:02 +08:00
net/usrsock: Revert 'net/usrsock: Optimize option dependence', commit 42f7c3e927. 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).
This commit is contained in:
committed by
Gregory Nutt
parent
9546481054
commit
3a65d39eb8
@@ -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
|
||||
****************************************************************************/
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user