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 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
net
/
can
/
mscan
/
mscan.c
diff --git
a/drivers/net/can/mscan/mscan.c
b/drivers/net/can/mscan/mscan.c
index
74cd880
..
92feac6
100644
(file)
--- a/
drivers/net/can/mscan/mscan.c
+++ b/
drivers/net/can/mscan/mscan.c
@@
-246,7
+246,7
@@
static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)
out_be16(®s->tx.idr3_2, can_id);
can_id >>= 16;
- /* EFF_FLAGS are
in
between the IDs :( */
+ /* EFF_FLAGS are between the IDs :( */
can_id = (can_id & 0x7) | ((can_id << 2) & 0xffe0)
| MSCAN_EFF_FLAGS;
} else {