From f7ef08cdc1a5c2844ffed3a54f4b6e33f3d2450e Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sat, 22 Feb 2020 18:12:37 +0800 Subject: [PATCH] net/usrsock: Don't return -ESHUTDOWN even usrsockdev_is_opened return false since usrsock_conn_s::resp::result contain more detailed info and fix the below error in usrsocktest: Testing group "WakeWithSignal" => [TEST ASSERT FAILED!] In function "do_usrsock_blocking_connect_thread": line 200: Assertion `(ssize_t)((*get_errno_ptr())) == (ssize_t)((test_abort ? 113 : 4))' failed. got value: 110 should be: 113 [TEST ASSERT FAILED!] In function "do_usrsock_blocking_connect_thread": line 200: Assertion `(ssize_t)((*get_errno_ptr())) == (ssize_t)((test_abort ? 113 : 4))' failed. got value: 110 should be: 113 [TEST ASSERT FAILED!] In function "do_usrsock_blocking_connect_thread": line 200: Assertion `(ssize_t)((*get_errno_ptr())) == (ssize_t)((test_abort ? 113 : 4))' failed. got value: 110 should be: 113 [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/usrsock/usrsock_dev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/usrsock/usrsock_dev.c b/net/usrsock/usrsock_dev.c index 9f1f21bff5..a557e99218 100644 --- a/net/usrsock/usrsock_dev.c +++ b/net/usrsock/usrsock_dev.c @@ -1155,7 +1155,6 @@ int usrsockdev_do_request(FAR struct usrsock_conn_s *conn, { FAR struct usrsockdev_s *dev = conn->dev; FAR struct usrsock_request_common_s *req_head = iov[0].iov_base; - int ret = OK; if (!dev) { @@ -1207,7 +1206,6 @@ int usrsockdev_do_request(FAR struct usrsock_conn_s *conn, { ninfo("usockid=%d; daemon abruptly closed /dev/usrsock.\n", conn->usockid); - ret = -ESHUTDOWN; } /* Free request line for next command. */ @@ -1216,7 +1214,7 @@ int usrsockdev_do_request(FAR struct usrsock_conn_s *conn, --dev->req.nbusy; /* net_lock held. */ - return ret; + return OK; } /****************************************************************************