diff options
author | Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 2009-07-20 21:57:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-23 20:58:19 -0400 |
commit | 2e2fb4b33d62c742019774c5e6e47711a3d60505 (patch) | |
tree | 6c08ace21696755d1e775bd6697ec992d507ccc6 /net/phonet | |
parent | c1dc13e9d0bc35a8d85bf4238c48c1b627d48f35 (diff) |
Phonet: account for dropped RX packets
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/phonet')
-rw-r--r-- | net/phonet/pep.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/phonet/pep.c b/net/phonet/pep.c index eef833ea6d7b..b8252d289cd7 100644 --- a/net/phonet/pep.c +++ b/net/phonet/pep.c | |||
@@ -346,8 +346,10 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb) | |||
346 | break; | 346 | break; |
347 | 347 | ||
348 | case PNS_PEP_CTRL_REQ: | 348 | case PNS_PEP_CTRL_REQ: |
349 | if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) | 349 | if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) { |
350 | atomic_inc(&sk->sk_drops); | ||
350 | break; | 351 | break; |
352 | } | ||
351 | __skb_pull(skb, 4); | 353 | __skb_pull(skb, 4); |
352 | queue = &pn->ctrlreq_queue; | 354 | queue = &pn->ctrlreq_queue; |
353 | goto queue; | 355 | goto queue; |
@@ -358,10 +360,13 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb) | |||
358 | err = sock_queue_rcv_skb(sk, skb); | 360 | err = sock_queue_rcv_skb(sk, skb); |
359 | if (!err) | 361 | if (!err) |
360 | return 0; | 362 | return 0; |
363 | if (err == -ENOMEM) | ||
364 | atomic_inc(&sk->sk_drops); | ||
361 | break; | 365 | break; |
362 | } | 366 | } |
363 | 367 | ||
364 | if (pn->rx_credits == 0) { | 368 | if (pn->rx_credits == 0) { |
369 | atomic_inc(&sk->sk_drops); | ||
365 | err = -ENOBUFS; | 370 | err = -ENOBUFS; |
366 | break; | 371 | break; |
367 | } | 372 | } |