From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: linux-can@vger.kernel.org, Olivier Sobrie <olivier@sobrie.be>,
linux-stable <stable@vger.kernel.org>,
Bhupesh Sharma <bhupesh.sharma@st.com>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH 1/3] can: c_can: fix invalid error codes
Date: Sat, 26 Jan 2013 17:33:25 +0100 [thread overview]
Message-ID: <1359218007-18586-2-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1359218007-18586-1-git-send-email-mkl@pengutronix.de>
From: Olivier Sobrie <olivier@sobrie.be>
Errors in CAN protocol (location) are reported in data[3] of the can
frame instead of data[2].
Cc: linux-stable <stable@vger.kernel.org>
Cc: Bhupesh Sharma <bhupesh.sharma@st.com>
Signed-off-by: Olivier Sobrie <olivier@sobrie.be>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/c_can/c_can.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index 5233b8f..58607f1 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -960,7 +960,7 @@ static int c_can_handle_bus_err(struct net_device *dev,
break;
case LEC_ACK_ERROR:
netdev_dbg(dev, "ack error\n");
- cf->data[2] |= (CAN_ERR_PROT_LOC_ACK |
+ cf->data[3] |= (CAN_ERR_PROT_LOC_ACK |
CAN_ERR_PROT_LOC_ACK_DEL);
break;
case LEC_BIT1_ERROR:
@@ -973,7 +973,7 @@ static int c_can_handle_bus_err(struct net_device *dev,
break;
case LEC_CRC_ERROR:
netdev_dbg(dev, "CRC error\n");
- cf->data[2] |= (CAN_ERR_PROT_LOC_CRC_SEQ |
+ cf->data[3] |= (CAN_ERR_PROT_LOC_CRC_SEQ |
CAN_ERR_PROT_LOC_CRC_DEL);
break;
default:
--
1.7.10.4
next prev parent reply other threads:[~2013-01-26 16:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-26 16:33 pull-request: can 2013-01-26 Marc Kleine-Budde
2013-01-26 16:33 ` Marc Kleine-Budde [this message]
2013-01-26 16:33 ` [PATCH 2/3] can: ti_hecc: fix invalid error codes Marc Kleine-Budde
2013-01-26 16:33 ` [PATCH 3/3] can: pch_can: " Marc Kleine-Budde
2013-01-27 5:48 ` pull-request: can 2013-01-26 David Miller
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=1359218007-18586-2-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=bhupesh.sharma@st.com \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olivier@sobrie.be \
--cc=stable@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).