summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorOlivier Sobrie <olivier@sobrie.be>2013-01-18 09:32:41 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-03 18:24:40 -0600
commit83829ab554f01ee5fcef4880b0a90cc14350b936 (patch)
tree5d2a220f5863d11e61729f7548c7f5705563b4f6 /drivers/net
parent1c539392d87f6e89bfbdab14438710826373a31b (diff)
downloadlinux-3.10-83829ab554f01ee5fcef4880b0a90cc14350b936.tar.gz
linux-3.10-83829ab554f01ee5fcef4880b0a90cc14350b936.tar.bz2
linux-3.10-83829ab554f01ee5fcef4880b0a90cc14350b936.zip
can: pch_can: fix invalid error codes
commit ee50e135aeb048b90fab662e661c58b67341830b upstream. Errors in CAN protocol (location) are reported in data[3] of the can frame instead of data[2]. Signed-off-by: Olivier Sobrie <olivier@sobrie.be> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/can/pch_can.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 2bb215e00eb..ab13a57ae3b 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -560,7 +560,7 @@ static void pch_can_error(struct net_device *ndev, u32 status)
stats->rx_errors++;
break;
case PCH_CRC_ERR:
- cf->data[2] |= CAN_ERR_PROT_LOC_CRC_SEQ |
+ cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ |
CAN_ERR_PROT_LOC_CRC_DEL;
priv->can.can_stats.bus_error++;
stats->rx_errors++;