From a457a3837b7b8c20eedc4d464a66fcc739aa337e Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Tue, 15 Apr 2008 00:16:19 -0700
Subject: [PATCH] --- yaml --- r: 90727 b: refs/heads/master c:
 4934c69a384ede7d0c3009098184554da2063de6 h: refs/heads/master i:   90725:
 e52baa794a83230217c375bc320eb7f596107918   90723:
 3a385f4b960a34a2ad3eeaee90cf8d38714f3f99   90719:
 913cc5e5f48c2fdbab9295cd999d4c029283c4ef v: v3

---
 [refs]                  | 2 +-
 trunk/net/tipc/socket.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bec2c1b46cb2..84ea1fa15c86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1819b83718dc3fe0aea0a2c3cd48d617e2003606
+refs/heads/master: 4934c69a384ede7d0c3009098184554da2063de6
diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c
index 4c83aba575c5..348e4ff881ab 100644
--- a/trunk/net/tipc/socket.c
+++ b/trunk/net/tipc/socket.c
@@ -1260,6 +1260,11 @@ static int connect(struct socket *sock, struct sockaddr *dest, int destlen,
    if (sock->state == SS_READY)
 	   return -EOPNOTSUPP;
 
+   /* For now, TIPC does not support the non-blocking form of connect() */
+
+   if (flags & O_NONBLOCK)
+	   return -EWOULDBLOCK;
+
    /* Issue Posix-compliant error code if socket is in the wrong state */
 
    if (sock->state == SS_LISTENING)