---

yaml --- r: 34516 b: refs/heads/master c: 8abfedd h: refs/heads/master v: v3
git-mirror · Sep 22, 2006 · 6d826bd · 6d826bd
1 parent 7f9e94e
commit 6d826bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb5fa39f5ef490c72901b547ac5e7211efd47d56
+refs/heads/master: 8abfedd889e46ad4977dfcdab737edf5c5803c62
diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c
@@ -2970,7 +2970,7 @@ SCTP_STATIC struct sock *sctp_accept(struct sock *sk, int flags, int *err)
 		goto out;
 	}
 
-	timeo = sock_rcvtimeo(sk, sk->sk_socket->file->f_flags & O_NONBLOCK);
+	timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);
 
 	error = sctp_wait_for_accept(sk, timeo);
 	if (error)