diff options
Diffstat (limited to 'net/phonet/pep.c')
-rw-r--r-- | net/phonet/pep.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/phonet/pep.c b/net/phonet/pep.c index e77411735de8..70a547ea5177 100644 --- a/net/phonet/pep.c +++ b/net/phonet/pep.c | |||
@@ -462,10 +462,9 @@ out: | |||
462 | queue: | 462 | queue: |
463 | skb->dev = NULL; | 463 | skb->dev = NULL; |
464 | skb_set_owner_r(skb, sk); | 464 | skb_set_owner_r(skb, sk); |
465 | err = skb->len; | ||
466 | skb_queue_tail(queue, skb); | 465 | skb_queue_tail(queue, skb); |
467 | if (!sock_flag(sk, SOCK_DEAD)) | 466 | if (!sock_flag(sk, SOCK_DEAD)) |
468 | sk->sk_data_ready(sk, err); | 467 | sk->sk_data_ready(sk); |
469 | return NET_RX_SUCCESS; | 468 | return NET_RX_SUCCESS; |
470 | } | 469 | } |
471 | 470 | ||
@@ -587,10 +586,9 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb) | |||
587 | pn->rx_credits--; | 586 | pn->rx_credits--; |
588 | skb->dev = NULL; | 587 | skb->dev = NULL; |
589 | skb_set_owner_r(skb, sk); | 588 | skb_set_owner_r(skb, sk); |
590 | err = skb->len; | ||
591 | skb_queue_tail(&sk->sk_receive_queue, skb); | 589 | skb_queue_tail(&sk->sk_receive_queue, skb); |
592 | if (!sock_flag(sk, SOCK_DEAD)) | 590 | if (!sock_flag(sk, SOCK_DEAD)) |
593 | sk->sk_data_ready(sk, err); | 591 | sk->sk_data_ready(sk); |
594 | return NET_RX_SUCCESS; | 592 | return NET_RX_SUCCESS; |
595 | 593 | ||
596 | case PNS_PEP_CONNECT_RESP: | 594 | case PNS_PEP_CONNECT_RESP: |
@@ -698,7 +696,7 @@ static int pep_do_rcv(struct sock *sk, struct sk_buff *skb) | |||
698 | skb_queue_head(&sk->sk_receive_queue, skb); | 696 | skb_queue_head(&sk->sk_receive_queue, skb); |
699 | sk_acceptq_added(sk); | 697 | sk_acceptq_added(sk); |
700 | if (!sock_flag(sk, SOCK_DEAD)) | 698 | if (!sock_flag(sk, SOCK_DEAD)) |
701 | sk->sk_data_ready(sk, 0); | 699 | sk->sk_data_ready(sk); |
702 | return NET_RX_SUCCESS; | 700 | return NET_RX_SUCCESS; |
703 | 701 | ||
704 | case PNS_PEP_DISCONNECT_REQ: | 702 | case PNS_PEP_DISCONNECT_REQ: |