diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-03 09:31:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-03 09:31:58 -0400 |
| commit | 9c54aeb03a6d65a5834bd92376e921cbac6dfb8f (patch) | |
| tree | 70441095d58678711d68cfef4934765251425d1f /net/core | |
| parent | eaf47b17a77fda841a1102d76c15161ee438b347 (diff) | |
| parent | 918fe1b3157978ada4267468008c5f89ef101e7d (diff) | |
| download | linux-9c54aeb03a6d65a5834bd92376e921cbac6dfb8f.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Filling in the padding slot in the bpf structure as a bug fix in 'ne'
overlapped with actually using that padding area for something in
'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/net-sysfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index c476f0794132..bb7e80f4ced3 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -1214,9 +1214,6 @@ static ssize_t xps_cpus_show(struct netdev_queue *queue, cpumask_var_t mask; unsigned long index; - if (!zalloc_cpumask_var(&mask, GFP_KERNEL)) - return -ENOMEM; - index = get_netdev_queue_index(queue); if (dev->num_tc) { @@ -1226,6 +1223,9 @@ static ssize_t xps_cpus_show(struct netdev_queue *queue, return -EINVAL; } + if (!zalloc_cpumask_var(&mask, GFP_KERNEL)) + return -ENOMEM; + rcu_read_lock(); dev_maps = rcu_dereference(dev->xps_maps); if (dev_maps) { |