From dd19105419951b3877102a688ecb7360ae7ceaa5 Mon Sep 17 00:00:00 2001 From: Ursula Braun Date: Wed, 8 Feb 2012 00:19:46 +0000 Subject: [PATCH] --- yaml --- r: 290061 b: refs/heads/master c: 7f1b0ea42a800713a3d56e1e8ca1a845e0461ca2 h: refs/heads/master i: 290059: b6f8bd69ad90e3d59282ca900ead6c5407cc1a6e v: v3 --- [refs] | 2 +- trunk/net/iucv/af_iucv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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);