diff --git a/[refs] b/[refs] index 63de9cc8de75..0aaea1b98769 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d316b9453523498246e9e19a659c423d4c5081e +refs/heads/master: 7f1b0ea42a800713a3d56e1e8ca1a845e0461ca2 diff --git a/trunk/net/iucv/af_iucv.c b/trunk/net/iucv/af_iucv.c index 3ce0259499ed..ef6ab71921fc 100644 --- a/trunk/net/iucv/af_iucv.c +++ b/trunk/net/iucv/af_iucv.c @@ -1490,7 +1490,7 @@ unsigned int iucv_sock_poll(struct file *file, struct socket *sock, if (sk->sk_state == IUCV_DISCONN) mask |= POLLIN; - if (sock_writeable(sk)) + if (sock_writeable(sk) && iucv_below_msglim(sk)) mask |= POLLOUT | POLLWRNORM | POLLWRBAND; else set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags);