From patchwork Fri Jan 8 11:57:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 43542 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E81B5B7CCD for ; Sat, 23 Jan 2010 10:29:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755699Ab0AVX0S (ORCPT ); Fri, 22 Jan 2010 18:26:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751214Ab0AVX0M (ORCPT ); Fri, 22 Jan 2010 18:26:12 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:33266 "EHLO fmmailgate03.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756177Ab0AVX0H (ORCPT ); Fri, 22 Jan 2010 18:26:07 -0500 Received: from smtp06.web.de (fmsmtp06.dlan.cinetic.de [172.20.5.172]) by fmmailgate03.web.de (Postfix) with ESMTP id D7A3A13C78402; Sat, 23 Jan 2010 00:26:06 +0100 (CET) Received: from [92.75.141.69] (helo=[192.168.1.10]) by smtp06.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #314) id 1NYStC-0000Zd-00; Sat, 23 Jan 2010 00:26:06 +0100 Message-Id: In-Reply-To: References: From: Jan Kiszka To: David Miller , Karsten Keil Cc: linux-kernel@vger.kernel.org, i4ldeveloper@listserv.isdn4linux.de, isdn4linux@listserv.isdn4linux.de, netdev@vger.kernel.org Date: Fri, 8 Jan 2010 12:57:25 +0100 Subject: [PATCH 25/31] CAPI: Drop capiminor's unused inbytes counter X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX181feyfLEaH3qli+fqDJaFhvYXU34KEddHuoBfU kls17kfHtvY6Xq1TG6sn4zP7ogajlgrhIIvZkXk9IgpWj4ckTy jE/ZRa24A= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The inbytes counter was only updated but never read. Signed-off-by: Jan Kiszka --- drivers/isdn/capi/capi.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index 6ab496c..40468ac 100644 --- a/drivers/isdn/capi/capi.c +++ b/drivers/isdn/capi/capi.c @@ -100,7 +100,6 @@ struct capiminor { struct sk_buff *ttyskb; struct sk_buff_head inqueue; - int inbytes; struct sk_buff_head outqueue; int outbytes; @@ -481,15 +480,12 @@ keep: static void handle_minor_recv(struct capiminor *mp) { struct sk_buff *skb; - while ((skb = skb_dequeue(&mp->inqueue)) != NULL) { - unsigned int len = skb->len; - mp->inbytes -= len; + + while ((skb = skb_dequeue(&mp->inqueue)) != NULL) if (handle_recv_skb(mp, skb) < 0) { skb_queue_head(&mp->inqueue, skb); - mp->inbytes += len; return; } - } } static int handle_minor_send(struct capiminor *mp) @@ -611,7 +607,7 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb) datahandle, skb->len-CAPIMSG_LEN(skb->data)); #endif skb_queue_tail(&mp->inqueue, skb); - mp->inbytes += skb->len; + handle_minor_recv(mp); } else if (CAPIMSG_SUBCOMMAND(skb->data) == CAPI_CONF) {