Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/can/usb/ems_usb.c

2 files changed, 21 insertions, 1 deletions

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 5fe34d64ca2a..26c89aaeba62 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -637,6 +637,22 @@ static int can_changelink(struct net_device *dev,
         return 0;
 }
 
+static size_t can_get_size(const struct net_device *dev)
+{
+        struct can_priv *priv = netdev_priv(dev);
+        size_t size;
+
+        size = nla_total_size(sizeof(u32));   /* IFLA_CAN_STATE */
+        size += sizeof(struct can_ctrlmode);  /* IFLA_CAN_CTRLMODE */
+        size += nla_total_size(sizeof(u32));  /* IFLA_CAN_RESTART_MS */
+        size += sizeof(struct can_bittiming); /* IFLA_CAN_BITTIMING */
+        size += sizeof(struct can_clock);     /* IFLA_CAN_CLOCK */
+        if (priv->bittiming_const)            /* IFLA_CAN_BITTIMING_CONST */
+                size += sizeof(struct can_bittiming_const);
+
+        return size;
+}
+
 static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
 {
         struct can_priv *priv = netdev_priv(dev);
@@ -687,6 +703,7 @@ static struct rtnl_link_ops can_link_ops __read_mostly = {
         .setup          = can_setup,
         .newlink        = can_newlink,
         .changelink     = can_changelink,
+        .get_size       = can_get_size,
         .fill_info      = can_fill_info,
         .fill_xstats    = can_fill_xstats,
 };
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 3685f3e42d12..3e4419054c81 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -315,7 +315,7 @@ static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg)
         if (skb == NULL)
                 return;
 
-        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
@@ -801,6 +801,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];