From c43b8ca4e84412caa52425a8e05bcb30ff3dd4d8 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 20 Oct 2010 00:02:26 +0000
Subject: [PATCH] --- yaml --- r: 215440 b: refs/heads/master c:
 612eef4f4714d5c0e7127b7b245dbfc444d14a4b h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/can/mcp251x.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d38c9d1bd078..79167c6ee2ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5601b2dfae86198667dd6e075a074fbef0c83423
+refs/heads/master: 612eef4f4714d5c0e7127b7b245dbfc444d14a4b
diff --git a/trunk/drivers/net/can/mcp251x.c b/trunk/drivers/net/can/mcp251x.c
index 59f40bce1ffc..6aadc3e32bd5 100644
--- a/trunk/drivers/net/can/mcp251x.c
+++ b/trunk/drivers/net/can/mcp251x.c
@@ -705,7 +705,7 @@ static void mcp251x_error_skb(struct net_device *net, int can_id, int data1)
 
 	skb = alloc_can_err_skb(net, &frame);
 	if (skb) {
-		frame->can_id = can_id;
+		frame->can_id |= can_id;
 		frame->data[1] = data1;
 		netif_rx_ni(skb);
 	} else {