diff --git a/[refs] b/[refs] index d58d7b78d235..5f3bd5a576ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3720d40b201fe82dce1d8a64a31bfbf49c221771 +refs/heads/master: 35997e3157eba16c6124d440bdf9272087129b2a diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c index 69d0fd1f3920..b89c7b1a0d09 100644 --- a/trunk/net/tipc/socket.c +++ b/trunk/net/tipc/socket.c @@ -1380,7 +1380,7 @@ static int connect(struct socket *sock, struct sockaddr *dest, int destlen, /* For now, TIPC does not support the non-blocking form of connect() */ if (flags & O_NONBLOCK) { - res = -EWOULDBLOCK; + res = -EOPNOTSUPP; goto exit; }