diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /net/ipx | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'net/ipx')
| -rw-r--r-- | net/ipx/af_spx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipx/af_spx.c b/net/ipx/af_spx.c index 9f52dfe4e..1eb7a725c 100644 --- a/net/ipx/af_spx.c +++ b/net/ipx/af_spx.c @@ -89,7 +89,7 @@ static unsigned int spx_datagram_poll(struct file * file, struct socket *sock, p if (sock_writeable(sk)) mask |= POLLOUT | POLLWRNORM | POLLWRBAND; else - sk->socket->flags |= SO_NOSPACE; + set_bit(SOCK_ASYNC_NOSPACE,&sk->socket->flags); return mask; } @@ -231,7 +231,7 @@ static int spx_listen(struct socket *sock, int backlog) sk->ack_backlog = 0; sk->state = TCP_LISTEN; } - sk->socket->flags |= SO_ACCEPTCON; + sk->socket->flags |= __SO_ACCEPTCON; return (0); } @@ -248,7 +248,7 @@ static int spx_accept(struct socket *sock, struct socket *newsock, int flags) return (-EINVAL); sk = sock->sk; - if((sock->state != SS_UNCONNECTED) || !(sock->flags & SO_ACCEPTCON)) + if((sock->state != SS_UNCONNECTED) || !(sock->flags & __SO_ACCEPTCON)) return (-EINVAL); if(sock->type != SOCK_SEQPACKET) return (-EOPNOTSUPP); |