diff --git a/[refs] b/[refs] index fde32ce4bf53..03257745e4ab 100644 --- 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 index 30d2dbeebb43..3b6e82cb372f 100644 --- 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)