You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/01/11 18:23:19 UTC
[incubator-nuttx] branch pr82 updated (dd5748c -> 9f2881d)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch pr82
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from dd5748c binfmt/: Update copyright dates in all modified files.
new 287a895 net/tcp/tcp_send_unbuffered.c: Correct a bad signal number introduced in recent PR. There is no errno ETIMEOUT. Probably should be ETIMEDOUT.
new 0d2f8d0 net/tcp/tcp_send_unbuffered.c: Fix conditional test in same logic with the typo.
new 9f2881d Revert "net/tcp/tcp_send_unbuffered.c: Fix conditional test in same logic with the typo."
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
net/tcp/tcp_send_unbuffered.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[incubator-nuttx] 02/03: net/tcp/tcp_send_unbuffered.c: Fix
conditional test in same logic with the typo.
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch pr82
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 0d2f8d07d44a1321888a3cb8dcd7e47db7b3aa2c
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Sat Jan 11 12:06:41 2020 -0600
net/tcp/tcp_send_unbuffered.c: Fix conditional test in same logic with the typo.
---
net/tcp/tcp_send_unbuffered.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c
index 1ff0406..46776b3 100644
--- a/net/tcp/tcp_send_unbuffered.c
+++ b/net/tcp/tcp_send_unbuffered.c
@@ -704,7 +704,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
ret = net_timedwait(&state.snd_sem,
_SO_TIMEOUT(psock->s_sndtimeo));
- if (ret != -ETIMEDOUT || acked == state.snd_acked)
+ if (ret == -ETIMEDOUT && acked == state.snd_acked)
{
break; /* Timeout without any progress */
}
[incubator-nuttx] 03/03: Revert "net/tcp/tcp_send_unbuffered.c: Fix
conditional test in same logic with the typo."
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch pr82
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 9f2881de6508053f144ccada8e02da0c21c7b099
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Sat Jan 11 12:12:32 2020 -0600
Revert "net/tcp/tcp_send_unbuffered.c: Fix conditional test in same logic with the typo."
This reverts commit ca54da664f350269cda782440e881188e6d51785.
---
net/tcp/tcp_send_unbuffered.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c
index 46776b3..1ff0406 100644
--- a/net/tcp/tcp_send_unbuffered.c
+++ b/net/tcp/tcp_send_unbuffered.c
@@ -704,7 +704,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
ret = net_timedwait(&state.snd_sem,
_SO_TIMEOUT(psock->s_sndtimeo));
- if (ret == -ETIMEDOUT && acked == state.snd_acked)
+ if (ret != -ETIMEDOUT || acked == state.snd_acked)
{
break; /* Timeout without any progress */
}
[incubator-nuttx] 01/03: net/tcp/tcp_send_unbuffered.c: Correct a
bad signal number introduced in recent PR. There is no errno ETIMEOUT.
Probably should be ETIMEDOUT.
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch pr82
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 287a89592955ed70f695aceb004a9b9ea8fcb0c8
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Sat Jan 11 11:42:09 2020 -0600
net/tcp/tcp_send_unbuffered.c: Correct a bad signal number introduced in recent PR. There is no errno ETIMEOUT. Probably should be ETIMEDOUT.
---
net/tcp/tcp_send_unbuffered.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c
index 1d9b502..1ff0406 100644
--- a/net/tcp/tcp_send_unbuffered.c
+++ b/net/tcp/tcp_send_unbuffered.c
@@ -704,7 +704,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
ret = net_timedwait(&state.snd_sem,
_SO_TIMEOUT(psock->s_sndtimeo));
- if (ret != -ETIMEOUT || acked == state.snd_acked)
+ if (ret != -ETIMEDOUT || acked == state.snd_acked)
{
break; /* Timeout without any progress */
}