3.0-stable patches

added patches:
	can-c_can-fix-invalid-error-codes.patch
	can-pch_can-fix-invalid-error-codes.patch
	can-ti_hecc-fix-invalid-error-codes.patch

diff --git a/queue-3.0/can-c_can-fix-invalid-error-codes.patch b/queue-3.0/can-c_can-fix-invalid-error-codes.patch
new file mode 100644 (file)
index 0000000..f3327b7
--- /dev/null
+++ b/queue-3.0/can-c_can-fix-invalid-error-codes.patch
@@ -0,0 +1,41 @@
+From 6ea45886865c1abb01bb861f7f6bdd5d0f398cb3 Mon Sep 17 00:00:00 2001
+From: Olivier Sobrie <olivier@sobrie.be>
+Date: Fri, 18 Jan 2013 09:32:39 +0100
+Subject: can: c_can: fix invalid error codes
+
+From: Olivier Sobrie <olivier@sobrie.be>
+
+commit 6ea45886865c1abb01bb861f7f6bdd5d0f398cb3 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>
+Cc: Bhupesh Sharma <bhupesh.sharma@st.com>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/can/c_can/c_can.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/can/c_can/c_can.c
++++ b/drivers/net/can/c_can/c_can.c
+@@ -916,7 +916,7 @@ static int c_can_handle_bus_err(struct n
+               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:
+@@ -929,7 +929,7 @@ static int c_can_handle_bus_err(struct n
+               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:

diff --git a/queue-3.0/can-pch_can-fix-invalid-error-codes.patch b/queue-3.0/can-pch_can-fix-invalid-error-codes.patch
new file mode 100644 (file)
index 0000000..b641f91
--- /dev/null
+++ b/queue-3.0/can-pch_can-fix-invalid-error-codes.patch
@@ -0,0 +1,31 @@
+From ee50e135aeb048b90fab662e661c58b67341830b Mon Sep 17 00:00:00 2001
+From: Olivier Sobrie <olivier@sobrie.be>
+Date: Fri, 18 Jan 2013 09:32:41 +0100
+Subject: can: pch_can: fix invalid error codes
+
+From: Olivier Sobrie <olivier@sobrie.be>
+
+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>
+
+---
+ drivers/net/can/pch_can.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/can/pch_can.c
++++ b/drivers/net/can/pch_can.c
+@@ -559,7 +559,7 @@ static void pch_can_error(struct net_dev
+               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++;

diff --git a/queue-3.0/can-ti_hecc-fix-invalid-error-codes.patch b/queue-3.0/can-ti_hecc-fix-invalid-error-codes.patch
new file mode 100644 (file)
index 0000000..80ad921
--- /dev/null
+++ b/queue-3.0/can-ti_hecc-fix-invalid-error-codes.patch
@@ -0,0 +1,38 @@
+From 71088c4bd9b8f8cbffb0e66f2abc14297e4b2ca8 Mon Sep 17 00:00:00 2001
+From: Olivier Sobrie <olivier@sobrie.be>
+Date: Fri, 18 Jan 2013 09:32:40 +0100
+Subject: can: ti_hecc: fix invalid error codes
+
+From: Olivier Sobrie <olivier@sobrie.be>
+
+commit 71088c4bd9b8f8cbffb0e66f2abc14297e4b2ca8 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>
+Cc: Anant Gole <anantgole@ti.com>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/can/ti_hecc.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/can/ti_hecc.c
++++ b/drivers/net/can/ti_hecc.c
+@@ -734,12 +734,12 @@ static int ti_hecc_error(struct net_devi
+               }
+               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;
+               }
+       }

diff --git a/queue-3.0/series b/queue-3.0/series
new file mode 100644 (file)
index 0000000..575614d
--- /dev/null
+++ b/queue-3.0/series
@@ -0,0 +1,3 @@
+can-c_can-fix-invalid-error-codes.patch
+can-ti_hecc-fix-invalid-error-codes.patch
+can-pch_can-fix-invalid-error-codes.patch