From bd410a4ac634faa58b58e7d8d0e4501a4254c5f3 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 30 Sep 2010 09:46:00 +0200 Subject: [PATCH] --- yaml --- r: 215209 b: refs/heads/master c: 711e4d6eccd72c57938228b8e0c29cb205527032 h: refs/heads/master i: 215207: 41c85aa9b980d7781e0470be53d98bb8fe3afa83 v: v3 --- [refs] | 2 +- trunk/drivers/net/can/mcp251x.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 20c9096dba8b..41a385419942 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57d3c7b09bd797b8db974557a71df8675a22601b +refs/heads/master: 711e4d6eccd72c57938228b8e0c29cb205527032 diff --git a/trunk/drivers/net/can/mcp251x.c b/trunk/drivers/net/can/mcp251x.c index c06e02382eca..fdea752f398f 100644 --- a/trunk/drivers/net/can/mcp251x.c +++ b/trunk/drivers/net/can/mcp251x.c @@ -816,10 +816,14 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id) if (intf & CANINTF_ERRIF) { /* Handle overflow counters */ if (eflag & (EFLG_RX0OVR | EFLG_RX1OVR)) { - if (eflag & EFLG_RX0OVR) + if (eflag & EFLG_RX0OVR) { net->stats.rx_over_errors++; - if (eflag & EFLG_RX1OVR) + net->stats.rx_errors++; + } + if (eflag & EFLG_RX1OVR) { net->stats.rx_over_errors++; + net->stats.rx_errors++; + } can_id |= CAN_ERR_CRTL; data1 |= CAN_ERR_CRTL_RX_OVERFLOW; }