diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-18 09:55:16 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-18 09:55:16 +0100 |
| commit | c6c598ca5fba68fbd6612f3330c4015142f2f86a (patch) | |
| tree | c69ae4debb2b0cdfe423f030478c7c29e5c1c7e7 | |
| parent | 072035eba1ceb87a987cc03d756fc2da3f3ba058 (diff) | |
| parent | 3424c8a9c89a3bc0d29ad38520d2f060e0d0479c (diff) | |
Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20160415' into staging
wxx patch queue
# gpg: Signature made Fri 15 Apr 2016 18:36:41 BST using RSA key ID 677450AD
# gpg: Good signature from "Stefan Weil <sw@weilnetz.de>"
# gpg: aka "Stefan Weil <stefan.weil@weilnetz.de>"
# gpg: aka "Stefan Weil <stefan.weil@bib.uni-mannheim.de>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2 B78A E08C 21D5 6774 50AD
* remotes/weil/tags/pull-wxx-20160415:
wxx: Fix broken TCP networking (regression)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | slirp/slirp.h | 5 | ||||
| -rw-r--r-- | slirp/tcp_input.c | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/slirp/slirp.h b/slirp/slirp.h index c99ebb9621..203deec480 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -347,9 +347,4 @@ struct tcpcb *tcp_drop(struct tcpcb *tp, int err); #define max(x,y) ((x) > (y) ? (x) : (y)) #endif -#ifdef _WIN32 -#undef errno -#define errno (WSAGetLastError()) -#endif - #endif diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index 5433e7fe9c..e2b5d4ebbb 100644 --- a/slirp/tcp_input.c +++ b/slirp/tcp_input.c @@ -659,6 +659,7 @@ findso: } if ((tcp_fconnect(so, so->so_ffamily) == -1) && + (errno != EAGAIN) && (errno != EINPROGRESS) && (errno != EWOULDBLOCK) ) { uint8_t code; |