* [PATCH 1/3] can: c_can: fix invalid error codes
2013-01-26 16:33 pull-request: can 2013-01-26 Marc Kleine-Budde
@ 2013-01-26 16:33 ` Marc Kleine-Budde
2013-01-26 16:33 ` [PATCH 2/3] can: ti_hecc: " Marc Kleine-Budde
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2013-01-26 16:33 UTC (permalink / raw)
To: netdev
Cc: linux-can, Olivier Sobrie, linux-stable, Bhupesh Sharma,
Marc Kleine-Budde
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] can: ti_hecc: fix invalid error codes
2013-01-26 16:33 pull-request: can 2013-01-26 Marc Kleine-Budde
2013-01-26 16:33 ` [PATCH 1/3] can: c_can: fix invalid error codes Marc Kleine-Budde
@ 2013-01-26 16:33 ` 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
3 siblings, 0 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2013-01-26 16:33 UTC (permalink / raw)
To: netdev
Cc: linux-can, Olivier Sobrie, linux-stable, Anant Gole,
Marc Kleine-Budde
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: Anant Gole <anantgole@ti.com>
Signed-off-by: Olivier Sobrie <olivier@sobrie.be>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/ti_hecc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index f898c63..300581b 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -746,12 +746,12 @@ static int ti_hecc_error(struct net_device *ndev, int int_status,
}
if (err_status & HECC_CANES_CRCE) {
hecc_set_bit(priv, HECC_CANES, HECC_CANES_CRCE);
- cf->data[2] |= CAN_ERR_PROT_LOC_CRC_SEQ |
+ cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ |
CAN_ERR_PROT_LOC_CRC_DEL;
}
if (err_status & HECC_CANES_ACKE) {
hecc_set_bit(priv, HECC_CANES, HECC_CANES_ACKE);
- cf->data[2] |= CAN_ERR_PROT_LOC_ACK |
+ cf->data[3] |= CAN_ERR_PROT_LOC_ACK |
CAN_ERR_PROT_LOC_ACK_DEL;
}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] can: pch_can: fix invalid error codes
2013-01-26 16:33 pull-request: can 2013-01-26 Marc Kleine-Budde
2013-01-26 16:33 ` [PATCH 1/3] can: c_can: fix invalid error codes Marc Kleine-Budde
2013-01-26 16:33 ` [PATCH 2/3] can: ti_hecc: " Marc Kleine-Budde
@ 2013-01-26 16:33 ` Marc Kleine-Budde
2013-01-27 5:48 ` pull-request: can 2013-01-26 David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2013-01-26 16:33 UTC (permalink / raw)
To: netdev; +Cc: linux-can, Olivier Sobrie, linux-stable, Marc Kleine-Budde
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>
Signed-off-by: Olivier Sobrie <olivier@sobrie.be>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/pch_can.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 7d17485..5c314a9 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++;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: pull-request: can 2013-01-26
2013-01-26 16:33 pull-request: can 2013-01-26 Marc Kleine-Budde
` (2 preceding siblings ...)
2013-01-26 16:33 ` [PATCH 3/3] can: pch_can: " Marc Kleine-Budde
@ 2013-01-27 5:48 ` David Miller
3 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2013-01-27 5:48 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Sat, 26 Jan 2013 17:33:24 +0100
> here's a patch for net for the v3.8 release cycle. Olivier Sobrie found and
> fixed a problem in the can error frame generation of three drivers (c_can,
> pch_can and ti_hecc).
Pulled, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread