summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Haas <haas@ems-wuensche.com>2009-11-04 05:48:33 +0000
committerDavid S. Miller <davem@davemloft.net>2009-11-06 20:26:07 -0800
commit2b2072e902848a63168570f500a5726744b3873a (patch)
tree754df0db6446ed1f53e59002b5137a792be5eaff
parent4f2aa89cd263932d61f286307771996df76bf63e (diff)
downloadop-kernel-dev-2b2072e902848a63168570f500a5726744b3873a.zip
op-kernel-dev-2b2072e902848a63168570f500a5726744b3873a.tar.gz
ems_usb: Fix byte order issues on big endian machines
CPC-USB is using a ARM7 core with little endian byte order. The "id" field in can_msg needs byte order conversion from/to CPU byte order. Signed-off-by: Sebastian Haas <haas@ems-wuensche.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/can/usb/ems_usb.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 9012e0a..abdbd9c 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -319,7 +319,7 @@ static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg)
cf = (struct can_frame *)skb_put(skb, sizeof(struct can_frame));
- cf->can_id = msg->msg.can_msg.id;
+ cf->can_id = le32_to_cpu(msg->msg.can_msg.id);
cf->can_dlc = min_t(u8, msg->msg.can_msg.length, 8);
if (msg->type == CPC_MSG_TYPE_EXT_CAN_FRAME
@@ -813,6 +813,9 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
msg->length = CPC_CAN_MSG_MIN_SIZE + cf->can_dlc;
}
+ /* Respect byte order */
+ msg->msg.can_msg.id = cpu_to_le32(msg->msg.can_msg.id);
+
for (i = 0; i < MAX_TX_URBS; i++) {
if (dev->tx_contexts[i].echo_index == MAX_TX_URBS) {
context = &dev->tx_contexts[i];
OpenPOWER on IntegriCloud