From e78ad9f74bba0db1b9333a61fb369adb4711a139 Mon Sep 17 00:00:00 2001 From: "Ira W. Snyder" Date: Thu, 19 Jul 2012 08:54:18 -0700 Subject: [PATCH] --- yaml --- r: 315711 b: refs/heads/master c: 88b587039c1ad4e7a981bea3269eeb02a1a2a14b h: refs/heads/master i: 315709: 09ee6f7214934c37a7ce76771ab0636a620a55b1 315707: 35cea77acf110d48457620288f44bce907b983e2 315703: 492f36cac2e73a181775709718738835937f689f 315695: c3d259fa1979fee8b9c0849f6aca1e0d3eb0cbf7 315679: da70f77a1a1fddd637575f6c033f0a1994021921 315647: 8df9f2fbab2fc63d1e1ac6292e68b0d2d69fc7a5 v: v3 --- [refs] | 2 +- trunk/drivers/net/can/janz-ican3.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index be2bd5d7307e..21b4b46dea36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e4d6909a273ada78cf48379e478855bc13ae0cb +refs/heads/master: 88b587039c1ad4e7a981bea3269eeb02a1a2a14b diff --git a/trunk/drivers/net/can/janz-ican3.c b/trunk/drivers/net/can/janz-ican3.c index b19aca591c7a..4a5a8fb53a2f 100644 --- a/trunk/drivers/net/can/janz-ican3.c +++ b/trunk/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; }