iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ICSK]: Generalise tcp_listen_poll

Browse Source 
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo 2005-08-23 21:52:58 -07:00 committed by David S. Miller
parent 2babe1f6fe
commit dc40c7bc76
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/net/inet_connection_sock.h
View File

@ -260,6 +260,16 @@ extern void inet_csk_reqsk_queue_prune(struct sock *parent,
const unsigned long max_rto); const unsigned long max_rto);
extern void inet_csk_destroy_sock(struct sock *sk); extern void inet_csk_destroy_sock(struct sock *sk);
/*
* LISTEN is a special case for poll..
*/
static inline unsigned int inet_csk_listen_poll(const struct sock *sk)
{
return !reqsk_queue_empty(&inet_csk(sk)->icsk_accept_queue) ?
(POLLIN | POLLRDNORM) : 0;
}
extern int inet_csk_listen_start(struct sock *sk, const int nr_table_entries); extern int inet_csk_listen_start(struct sock *sk, const int nr_table_entries);
extern void inet_csk_listen_stop(struct sock *sk); extern void inet_csk_listen_stop(struct sock *sk);

11
net/ipv4/tcp.c
View File

@ -309,15 +309,6 @@ void tcp_enter_memory_pressure(void)
EXPORT_SYMBOL(tcp_enter_memory_pressure); EXPORT_SYMBOL(tcp_enter_memory_pressure);
/*
* LISTEN is a special case for poll..
*/
static __inline__ unsigned int tcp_listen_poll(struct sock *sk,
poll_table *wait)
{
return !reqsk_queue_empty(&inet_csk(sk)->icsk_accept_queue) ? (POLLIN | POLLRDNORM) : 0;
}
/* /*
* Wait for a TCP event. * Wait for a TCP event.
* *
@ -333,7 +324,7 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
poll_wait(file, sk->sk_sleep, wait); poll_wait(file, sk->sk_sleep, wait);
if (sk->sk_state == TCP_LISTEN) if (sk->sk_state == TCP_LISTEN)
return tcp_listen_poll(sk, wait); return inet_csk_listen_poll(sk);
/* Socket is not locked. We are protected from async events /* Socket is not locked. We are protected from async events
by poll logic and correct handling of state changes by poll logic and correct handling of state changes