From patchwork Tue Nov 18 20:10:56 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Goglin X-Patchwork-Id: 9476 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 8181BDDDEF for ; Wed, 19 Nov 2008 07:11:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752359AbYKRULN (ORCPT ); Tue, 18 Nov 2008 15:11:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752216AbYKRULN (ORCPT ); Tue, 18 Nov 2008 15:11:13 -0500 Received: from mailbox2.myri.com ([64.172.73.26]:1940 "EHLO myri.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751935AbYKRULN (ORCPT ); Tue, 18 Nov 2008 15:11:13 -0500 Received: from [172.31.134.203] (brice-ovpn.sw.myri.com [172.31.134.203]) by myri.com (8.13.7+Sun/8.13.7) with ESMTP id mAIKAvQ7005249; Tue, 18 Nov 2008 12:10:57 -0800 (PST) Message-ID: <49232150.4010202@myri.com> Date: Tue, 18 Nov 2008 21:10:56 +0100 From: Brice Goglin User-Agent: Mozilla-Thunderbird 2.0.0.17 (X11/20081018) MIME-Version: 1.0 To: Jeff Garzik CC: netdev@vger.kernel.org Subject: [PATCH net-next] myri10ge: fix per-slice rx/tx_dropped counters X-Enigmail-Version: 0.95.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Properly attribute transmit and receive drops by incrementing the per-slice counter. Signed-off-by: Brice Goglin --- drivers/net/myri10ge/myri10ge.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 Index: net-next-2.6/drivers/net/myri10ge/myri10ge.c =================================================================== --- net-next-2.6.orig/drivers/net/myri10ge/myri10ge.c 2008-11-11 21:51:11.000000000 +0100 +++ net-next-2.6/drivers/net/myri10ge/myri10ge.c 2008-11-18 21:02:12.000000000 +0100 @@ -1309,7 +1309,7 @@ skb = netdev_alloc_skb(dev, MYRI10GE_HLEN + 16); if (unlikely(skb == NULL)) { - mgp->stats.rx_dropped++; + ss->stats.rx_dropped++; do { i--; put_page(rx_frags[i].page); @@ -2924,6 +2924,7 @@ { struct sk_buff *segs, *curr; struct myri10ge_priv *mgp = netdev_priv(dev); + struct myri10ge_slice_state *ss; int status; segs = skb_gso_segment(skb, dev->features & ~NETIF_F_TSO6); @@ -2950,8 +2951,9 @@ return 0; drop: + ss = &mgp->ss[skb_get_queue_mapping(skb)]; dev_kfree_skb_any(skb); - mgp->stats.tx_dropped += 1; + ss->stats.tx_dropped += 1; return 0; }