Commit f7ae8d59 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by David S. Miller

Phonet: allocate sock from accept syscall rather than soft IRQ

This moves most of the accept logic to process context like other
socket stacks do. Then we can use a few more common socket helpers
and simplify a bit.
Signed-off-by: default avatarRémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 44c9ab16
...@@ -28,7 +28,6 @@ struct pep_sock { ...@@ -28,7 +28,6 @@ struct pep_sock {
/* XXX: union-ify listening vs connected stuff ? */ /* XXX: union-ify listening vs connected stuff ? */
/* Listening socket stuff: */ /* Listening socket stuff: */
struct hlist_head ackq;
struct hlist_head hlist; struct hlist_head hlist;
/* Connected socket stuff: */ /* Connected socket stuff: */
......
This diff is collapsed.
...@@ -327,6 +327,9 @@ static int pn_socket_accept(struct socket *sock, struct socket *newsock, ...@@ -327,6 +327,9 @@ static int pn_socket_accept(struct socket *sock, struct socket *newsock,
struct sock *newsk; struct sock *newsk;
int err; int err;
if (unlikely(sk->sk_state != TCP_LISTEN))
return -EINVAL;
newsk = sk->sk_prot->accept(sk, flags, &err); newsk = sk->sk_prot->accept(sk, flags, &err);
if (!newsk) if (!newsk)
return err; return err;
...@@ -363,13 +366,8 @@ static unsigned int pn_socket_poll(struct file *file, struct socket *sock, ...@@ -363,13 +366,8 @@ static unsigned int pn_socket_poll(struct file *file, struct socket *sock,
poll_wait(file, sk_sleep(sk), wait); poll_wait(file, sk_sleep(sk), wait);
switch (sk->sk_state) { if (sk->sk_state == TCP_CLOSE)
case TCP_LISTEN:
return hlist_empty(&pn->ackq) ? 0 : POLLIN;
case TCP_CLOSE:
return POLLERR; return POLLERR;
}
if (!skb_queue_empty(&sk->sk_receive_queue)) if (!skb_queue_empty(&sk->sk_receive_queue))
mask |= POLLIN | POLLRDNORM; mask |= POLLIN | POLLRDNORM;
if (!skb_queue_empty(&pn->ctrlreq_queue)) if (!skb_queue_empty(&pn->ctrlreq_queue))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment