From patchwork Tue Jul 21 11:57:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 30025 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 2DB1FB7257 for ; Tue, 21 Jul 2009 22:01:09 +1000 (EST) Received: by ozlabs.org (Postfix) id 20EC4DDD1B; Tue, 21 Jul 2009 22:01:09 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id A3626DDD0B for ; Tue, 21 Jul 2009 22:01:08 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751621AbZGUL4T (ORCPT ); Tue, 21 Jul 2009 07:56:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751289AbZGUL4S (ORCPT ); Tue, 21 Jul 2009 07:56:18 -0400 Received: from smtp.nokia.com ([192.100.122.233]:54701 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754038AbZGULz5 (ORCPT ); Tue, 21 Jul 2009 07:55:57 -0400 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n6LBtZU2012342 for ; Tue, 21 Jul 2009 14:55:46 +0300 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 21 Jul 2009 14:55:42 +0300 Received: from mgw-da02.ext.nokia.com ([147.243.128.26]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Tue, 21 Jul 2009 14:55:41 +0300 Received: from localhost.localdomain (esdhcp03634.research.nokia.com [172.21.36.34]) by mgw-da02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n6LBtWcE014694 for ; Tue, 21 Jul 2009 14:55:35 +0300 From: =?utf-8?q?R=C3=A9mi=20Denis-Courmont?= To: netdev@vger.kernel.org Subject: [PATCH] Phonet: account for dropped RX packets Date: Tue, 21 Jul 2009 14:57:59 +0300 Message-Id: <1248177479-12669-3-git-send-email-remi.denis-courmont@nokia.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1248177479-12669-2-git-send-email-remi.denis-courmont@nokia.com> References: <1248177479-12669-1-git-send-email-remi.denis-courmont@nokia.com> <1248177479-12669-2-git-send-email-remi.denis-courmont@nokia.com> MIME-Version: 1.0 X-OriginalArrivalTime: 21 Jul 2009 11:55:42.0039 (UTC) FILETIME=[2C222670:01CA09FA] X-Nokia-AV: Clean Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Rémi Denis-Courmont Signed-off-by: Rémi Denis-Courmont --- 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 eef833e..b8252d2 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) break; case PNS_PEP_CTRL_REQ: - if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) + if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) { + atomic_inc(&sk->sk_drops); break; + } __skb_pull(skb, 4); queue = &pn->ctrlreq_queue; goto queue; @@ -358,10 +360,13 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb) err = sock_queue_rcv_skb(sk, skb); if (!err) return 0; + if (err == -ENOMEM) + atomic_inc(&sk->sk_drops); break; } if (pn->rx_credits == 0) { + atomic_inc(&sk->sk_drops); err = -ENOBUFS; break; }