git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[pandora-kernel.git]
/
drivers
/
net
/
can
/
mcp251x.c
diff --git
a/drivers/net/can/mcp251x.c
b/drivers/net/can/mcp251x.c
index
59f40bc
..
6aadc3e
100644
(file)
--- a/
drivers/net/can/mcp251x.c
+++ b/
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 {