GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-08 23:55:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
From: Patrick McHardy <kaber@trash.net>

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2007-07-20 19:45:45 -07:00 • committed by David S. Miller
parent fc7b93800b
commit 31ce72a6b1
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/netdevice.h
View file

@ -575,7 +575,7 @@ struct net_device
/* The TX queue control structures */ /* The TX queue control structures */
unsigned int egress_subqueue_count; 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) #define to_net_dev(d) container_of(d, struct net_device, dev)

4
net/core/dev.c
View file

@ -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 */ /* ensure 32-byte alignment of both the device and private area */
alloc_size = (sizeof(*dev) + NETDEV_ALIGN_CONST + 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; ~NETDEV_ALIGN_CONST;
alloc_size += sizeof_priv + 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 + dev->priv = ((char *)dev +
((sizeof(struct net_device) + ((sizeof(struct net_device) +
(sizeof(struct net_device_subqueue) * (sizeof(struct net_device_subqueue) *
queue_count) + NETDEV_ALIGN_CONST) (queue_count - 1)) + NETDEV_ALIGN_CONST)
& ~NETDEV_ALIGN_CONST)); & ~NETDEV_ALIGN_CONST));
} }