From: Marc Kleine-Budde <mkl@pengutronix.de>
To: linux-can@vger.kernel.org
Cc: "Ira W. Snyder" <iws@ovro.caltech.edu>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH 6/9] can: janz-ican3: fix error and byte counters
Date: Fri, 20 Jul 2012 13:11:46 +0200 [thread overview]
Message-ID: <1342782709-4868-7-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1342782709-4868-1-git-send-email-mkl@pengutronix.de>
From: "Ira W. Snyder" <iws@ovro.caltech.edu>
The error and byte counter statistics were being incremented
incorrectly. For example, a TX error would be counted both in tx_errors
and rx_errors.
This corrects the problem so that tx_errors and rx_errors are only
incremented for errors caused by packets sent to the bus. Error packets
generated by the driver are not counted.
The byte counters are only increased for packets which are actually
transmitted or received from the bus. Error packets generated by the
driver are not counted.
Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/janz-ican3.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index b19aca5..4a5a8fb 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -907,8 +907,8 @@ static void ican3_handle_msglost(struct ican3_dev *mod, struct ican3_msg *msg)
if (skb) {
cf->can_id |= CAN_ERR_CRTL;
cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
+ stats->rx_over_errors++;
stats->rx_errors++;
- stats->rx_bytes += cf->can_dlc;
netif_rx(skb);
}
}
@@ -982,7 +982,6 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)
dev_dbg(mod->dev, "bus error interrupt\n");
mod->can.can_stats.bus_error++;
- stats->rx_errors++;
cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
switch (ecc & ECC_MASK) {
@@ -1001,8 +1000,12 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)
break;
}
- if ((ecc & ECC_DIR) == 0)
+ if (!(ecc & ECC_DIR)) {
cf->data[2] |= CAN_ERR_PROT_TX;
+ stats->tx_errors++;
+ } else {
+ stats->rx_errors++;
+ }
cf->data[6] = txerr;
cf->data[7] = rxerr;
@@ -1028,8 +1031,6 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)
}
mod->can.state = state;
- stats->rx_errors++;
- stats->rx_bytes += cf->can_dlc;
netif_rx(skb);
return 0;
}
--
1.7.10
next prev parent reply other threads:[~2012-07-20 11:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-20 11:11 [PATCH 0/9] upcoming pull request: const annoations + flexcan + janz-ican3 update Marc Kleine-Budde
2012-07-20 11:11 ` [PATCH 1/9] can: mark bittiming_const pointer in struct can_priv as const Marc Kleine-Budde
2012-07-20 11:11 ` [PATCH 2/9] can: flexcan: add 2nd clock to support imx53 and newer Marc Kleine-Budde
2012-07-20 11:11 ` [PATCH 3/9] can: janz-ican3: remove dead code Marc Kleine-Budde
2012-07-20 11:11 ` [PATCH 4/9] can: janz-ican3: drop invalid skbs Marc Kleine-Budde
2012-07-20 11:11 ` [PATCH 5/9] can: janz-ican3: cleanup of ican3_to_can_frame and can_frame_to_ican3 Marc Kleine-Budde
2012-07-20 15:39 ` Ira W. Snyder
2012-07-20 11:11 ` Marc Kleine-Budde [this message]
2012-07-20 11:11 ` [PATCH 7/9] can: janz-ican3: fix support for CAN_RAW_RECV_OWN_MSGS Marc Kleine-Budde
2012-07-20 11:11 ` [PATCH 8/9] can: janz-ican3: avoid firmware lockup caused by infinite bus error quota Marc Kleine-Budde
2012-07-20 11:11 ` [PATCH 9/9] can: janz-ican3: add support for one shot mode Marc Kleine-Budde
2012-07-20 11:15 ` [PATCH 0/9] upcoming pull request: const annoations + flexcan + janz-ican3 update Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1342782709-4868-7-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=iws@ovro.caltech.edu \
--cc=linux-can@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).