From patchwork Sat Dec 4 05:55:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 74249 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 2AAA6B6EF1 for ; Sat, 4 Dec 2010 16:55:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752928Ab0LDFzt (ORCPT ); Sat, 4 Dec 2010 00:55:49 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:50376 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752521Ab0LDFzt (ORCPT ); Sat, 4 Dec 2010 00:55:49 -0500 Received: by yxt3 with SMTP id 3so4664708yxt.19 for ; Fri, 03 Dec 2010 21:55:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=9vwvy7NJkzVrqeOcUgtvZsqUjBLxUjXizxUdrsqHOzU=; b=YQhE521jItMvQd56OLr4lmMmqZ9s4ML5KVJcFAVQq4q0n1zIwZefvO7Zyw5I9szDGB viXzkIotDEiIjyYilM0ZuAJheKPeMvREUKgbZvHeTxOXQvsIKN0EwitHmX7rcXFlD2RA BbNJw/9yz3jNX3a/jyOGqJO/eKNypMTeRB0o4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=iaRoQP00/6N+Kp1Gulp4cNUu81rMk02+MeCUTEWejje+6DWG5GBsRNXOyi3SgiyM5W cJtx7a8AhkTyTen6R3LZqv2rA7cvV8NSmCl/2oP+hRQTxPgdPUFcnKLI1pW7i0omEtBG ffrfFHoevP12fTLfHArWNv8VDO2IHSJ/wZ82U= Received: by 10.90.63.6 with SMTP id l6mr4339409aga.125.1291442148381; Fri, 03 Dec 2010 21:55:48 -0800 (PST) Received: from localhost.localdomain ([221.239.34.230]) by mx.google.com with ESMTPS id c7sm2637565ana.37.2010.12.03.21.55.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 03 Dec 2010 21:55:47 -0800 (PST) From: Changli Gao To: jamal Cc: netdev@vger.kernel.org, jamal , Changli Gao Subject: [PATCH 1/3] ifb: remove the useless debug stats Date: Sat, 4 Dec 2010 13:55:19 +0800 Message-Id: <1291442121-3302-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org These debug stats are not exported, and become useless. Signed-off-by: Changli Gao Signed-off-by: Jamal Hadi Salim --- drivers/net/ifb.c | 19 ------------------- 1 file changed, 19 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index ab9f675..4387525 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c @@ -42,16 +42,6 @@ struct ifb_private { struct tasklet_struct ifb_tasklet; int tasklet_pending; - /* mostly debug stats leave in for now */ - unsigned long st_task_enter; /* tasklet entered */ - unsigned long st_txq_refl_try; /* transmit queue refill attempt */ - unsigned long st_rxq_enter; /* receive queue entered */ - unsigned long st_rx2tx_tran; /* receive to trasmit transfers */ - unsigned long st_rxq_notenter; /*receiveQ not entered, resched */ - unsigned long st_rx_frm_egr; /* received from egress path */ - unsigned long st_rx_frm_ing; /* received from ingress path */ - unsigned long st_rxq_check; - unsigned long st_rxq_rsch; struct sk_buff_head rq; struct sk_buff_head tq; }; @@ -73,19 +63,14 @@ static void ri_tasklet(unsigned long dev) struct sk_buff *skb; txq = netdev_get_tx_queue(_dev, 0); - dp->st_task_enter++; if ((skb = skb_peek(&dp->tq)) == NULL) { - dp->st_txq_refl_try++; if (__netif_tx_trylock(txq)) { - dp->st_rxq_enter++; while ((skb = skb_dequeue(&dp->rq)) != NULL) { skb_queue_tail(&dp->tq, skb); - dp->st_rx2tx_tran++; } __netif_tx_unlock(txq); } else { /* reschedule */ - dp->st_rxq_notenter++; goto resched; } } @@ -110,10 +95,8 @@ static void ri_tasklet(unsigned long dev) skb->skb_iif = _dev->ifindex; if (from & AT_EGRESS) { - dp->st_rx_frm_egr++; dev_queue_xmit(skb); } else if (from & AT_INGRESS) { - dp->st_rx_frm_ing++; skb_pull(skb, skb->dev->hard_header_len); netif_rx(skb); } else @@ -121,13 +104,11 @@ static void ri_tasklet(unsigned long dev) } if (__netif_tx_trylock(txq)) { - dp->st_rxq_check++; if ((skb = skb_peek(&dp->rq)) == NULL) { dp->tasklet_pending = 0; if (netif_queue_stopped(_dev)) netif_wake_queue(_dev); } else { - dp->st_rxq_rsch++; __netif_tx_unlock(txq); goto resched; }