1 files changed, 20 insertions, 4 deletions

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 0929c7d83e15..ac86be52b461 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -11,6 +11,7 @@
 #include <linux/if_arp.h>
 #include <linux/workqueue.h>
 #include <linux/can.h>
+#include <linux/can/can-ml.h>
 #include <linux/can/dev.h>
 #include <linux/can/skb.h>
 #include <linux/can/netlink.h>
@@ -713,11 +714,24 @@ struct net_device *alloc_candev_mqs(int sizeof_priv, unsigned int echo_skb_max,
         struct can_priv *priv;
         int size;
 
+        /* We put the driver's priv, the CAN mid layer priv and the
+         * echo skb into the netdevice's priv. The memory layout for
+         * the netdev_priv is like this:
+         *
+         * +-------------------------+
+         * | driver's priv           |
+         * +-------------------------+
+         * | struct can_ml_priv      |
+         * +-------------------------+
+         * | array of struct sk_buff |
+         * +-------------------------+
+         */
+
+        size = ALIGN(sizeof_priv, NETDEV_ALIGN) + sizeof(struct can_ml_priv);
+
         if (echo_skb_max)
-                size = ALIGN(sizeof_priv, sizeof(struct sk_buff *)) +
+                size = ALIGN(size, sizeof(struct sk_buff *)) +
                         echo_skb_max * sizeof(struct sk_buff *);
-        else
-                size = sizeof_priv;
 
         dev = alloc_netdev_mqs(size, "can%d", NET_NAME_UNKNOWN, can_setup,
                                txqs, rxqs);
@@ -727,10 +741,12 @@ struct net_device *alloc_candev_mqs(int sizeof_priv, unsigned int echo_skb_max,
         priv = netdev_priv(dev);
         priv->dev = dev;
 
+        dev->ml_priv = (void *)priv + ALIGN(sizeof_priv, NETDEV_ALIGN);
+
         if (echo_skb_max) {
                 priv->echo_skb_max = echo_skb_max;
                 priv->echo_skb = (void *)priv +
-                        ALIGN(sizeof_priv, sizeof(struct sk_buff *));
+                        (size - echo_skb_max * sizeof(struct sk_buff *));
         }
 
         priv->state = CAN_STATE_STOPPED;