Messages in this thread | | | Date | Mon, 9 Nov 2009 13:03:23 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net tree with the net-current tree |
| |
Hi all,
Today's linux-next merge of the net tree got a conflict in drivers/net/can/usb/ems_usb.c between commit 2b2072e902848a63168570f500a5726744b3873a ("ems_usb: Fix byte order issues on big endian machines") from the net-current tree and commit 7b6856a0296a8f187bb88ba31fa83a08abba7966 ("can: provide library functions for skb allocation") from the net tree.
Just context changes. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/can/usb/ems_usb.c index abdbd9c,3685f3e..0000000 --- a/drivers/net/can/usb/ems_usb.c +++ b/drivers/net/can/usb/ems_usb.c @@@ -315,11 -315,7 +315,7 @@@ static void ems_usb_rx_can_msg(struct e if (skb == NULL) return; - skb->protocol = htons(ETH_P_CAN); - 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
| |