---

yaml --- r: 215440 b: refs/heads/master c: 612eef4 h: refs/heads/master v: v3
git-mirror · Oct 21, 2010 · c43b8ca · c43b8ca
1 parent 22efd73
commit c43b8ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 {