From patchwork Thu Mar 24 10:38:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Altenberg X-Patchwork-Id: 88151 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 55BBCB6EFE for ; Thu, 24 Mar 2011 20:44:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755677Ab1CXJof (ORCPT ); Thu, 24 Mar 2011 05:44:35 -0400 Received: from www.linutronix.de ([62.245.132.108]:33491 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754245Ab1CXJoe (ORCPT ); Thu, 24 Mar 2011 05:44:34 -0400 Received: from localhost ([127.0.0.1]) by Galois.linutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Q2h5j-0004nX-7c; Thu, 24 Mar 2011 10:44:31 +0100 Subject: [PATCH] can: c_can: Fix tx_bytes accounting From: Jan Altenberg To: Bhupesh SHARMA Cc: "wg@grandegger.com" , "kurt.van.dijck@eia.be" , "b.spranger@linutronix.de" , "netdev@vger.kernel.org" , "Socketcan-core@lists.berlios.de" , jan@linutronix.de In-Reply-To: References: <16a340801622a96218c76dbbabc7a23f.squirrel@www.linutronix.de> Date: Thu, 24 Mar 2011 11:38:40 +0100 Message-Id: <1300963120.3295.7.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Bhupesh, as discussed I moved c_can_inval_msg_object() to the end of the if() statement. That should fix the tx_bytes accounting. For me it's working fine now. Signed-off-by: Jan Altenberg --- -- 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/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index 110eda0..f895c04 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c @@ -704,7 +704,6 @@ static void c_can_do_tx(struct net_device *dev) for (/* nix */; (priv->tx_next - priv->tx_echo) > 0; priv->tx_echo++) { msg_obj_no = get_tx_echo_msg_obj(priv); - c_can_inval_msg_object(dev, 0, msg_obj_no); val = c_can_read_reg32(priv, &priv->regs->txrqst1); if (!(val & (1 << msg_obj_no))) { can_get_echo_skb(dev, @@ -713,6 +712,7 @@ static void c_can_do_tx(struct net_device *dev) &priv->regs->ifregs[0].msg_cntrl) & IF_MCONT_DLC_MASK; stats->tx_packets++; + c_can_inval_msg_object(dev, 0, msg_obj_no); } }