Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31ce72a6 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NET]: Fix loopback crashes when multiqueue is enabled. 



From: Patrick McHardy <kaber@trash.net>

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc7b9380

include/linux/netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ struct net_device 


	/* The TX queue control structures */

	unsigned int			egress_subqueue_count;

	struct net_device_subqueue	egress_subqueue[0];

	struct net_device_subqueue	egress_subqueue[1];

};

#define to_net_dev(d) container_of(d, struct net_device, dev)

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -3624,7 +3624,7 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name, 


	/* ensure 32-byte alignment of both the device and private area */

	alloc_size = (sizeof(*dev) + NETDEV_ALIGN_CONST +

		     (sizeof(struct net_device_subqueue) * queue_count)) &

		     (sizeof(struct net_device_subqueue) * (queue_count - 1))) &

		     ~NETDEV_ALIGN_CONST;

	alloc_size += sizeof_priv + NETDEV_ALIGN_CONST;
@@ -3642,7 +3642,7 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name, 
		dev->priv = ((char *)dev +

			     ((sizeof(struct net_device) +

			       (sizeof(struct net_device_subqueue) *

				queue_count) + NETDEV_ALIGN_CONST)

				(queue_count - 1)) + NETDEV_ALIGN_CONST)

			      & ~NETDEV_ALIGN_CONST));

	}