diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /net/irda | |
parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) |
Merge with Linux 2.3.41.
Diffstat (limited to 'net/irda')
-rw-r--r-- | net/irda/af_irda.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index 8bea0ce98..bed8c5cc2 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -1522,7 +1522,7 @@ static unsigned int irda_poll(struct file * file, struct socket *sock, * we set writable also when the other side has shut down the * connection. This prevents stuck sockets. */ - if (sk->sndbuf - (int)atomic_read(&sk->wmem_alloc) >= MIN_WRITE_SPACE) + if (sk->sndbuf - (int)atomic_read(&sk->wmem_alloc) >= SOCK_MIN_WRITE_SPACE) mask |= POLLOUT | POLLWRNORM | POLLWRBAND; return mask; |