From 8c8771a29dc88eaf3329355d09b311b96bb7cf89 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sat, 22 Feb 2020 18:23:55 +0800 Subject: [PATCH] net/socket: Don't skip return -ENETDOWN in usrsock case Fix the below error in usrsocktest: Testing group "WakeWithSignal" => [TEST ASSERT FAILED!] In function "do_usrsock_blocking_socket_thread": line 122: Assertion `(ssize_t)((*get_errno_ptr())) == (ssize_t)((115))' failed. got value: 123 should be: 115 [TEST ASSERT FAILED!] In function "do_wake_test": line 567: Assertion `(bool)((usrsocktest_test_failed)) == (bool)(false)' failed. got value: 1 should be: 0 Group "WakeWithSignal": [FAILED] --- net/socket/socket.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/net/socket/socket.c b/net/socket/socket.c index 635ec4dc94..86ec8da929 100644 --- a/net/socket/socket.c +++ b/net/socket/socket.c @@ -113,23 +113,8 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock) */ ret = g_usrsock_sockif.si_setup(psock, protocol); - if (ret == -ENETDOWN) - { - /* -ENETDOWN means that USRSOCK daemon is not running. Attempt to - * open socket with kernel networking stack. - */ - } - else - { - psock->s_sockif = &g_usrsock_sockif; - - if (ret < 0) - { - return ret; - } - - return ret; - } + psock->s_sockif = &g_usrsock_sockif; + return ret; } #endif /* CONFIG_NET_USRSOCK */