From ab40b1d2f69b4c03940dedaa69ef5e88a83c901f Mon Sep 17 00:00:00 2001 From: david decotigny Date: Wed, 16 Nov 2011 12:15:08 +0000 Subject: [PATCH] --- yaml --- r: 277587 b: refs/heads/master c: 19b05f811341aaef3e5e22d2832aa2d8e0bad5ab h: refs/heads/master i: 277585: f7f94be2900b444cc2a5689283030fea8a3a5b66 277583: dd176060ff17bbcfcbd435251c24b27b07d4dd44 v: v3 --- [refs] | 2 +- trunk/net/core/net-sysfs.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 33751eb72972..36ccc2ebfc2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 674aee3b351c57d8b89f363c8947db74756545f8 +refs/heads/master: 19b05f811341aaef3e5e22d2832aa2d8e0bad5ab diff --git a/trunk/net/core/net-sysfs.c b/trunk/net/core/net-sysfs.c index c71c434a4c05..a64382f201b8 100644 --- a/trunk/net/core/net-sysfs.c +++ b/trunk/net/core/net-sysfs.c @@ -901,7 +901,7 @@ static ssize_t store_xps_map(struct netdev_queue *queue, struct xps_map *map, *new_map; struct xps_dev_maps *dev_maps, *new_dev_maps; int nonempty = 0; - int numa_node = -2; + int numa_node_id = -2; if (!capable(CAP_NET_ADMIN)) return -EPERM; @@ -944,10 +944,10 @@ static ssize_t store_xps_map(struct netdev_queue *queue, need_set = cpumask_test_cpu(cpu, mask) && cpu_online(cpu); #ifdef CONFIG_NUMA if (need_set) { - if (numa_node == -2) - numa_node = cpu_to_node(cpu); - else if (numa_node != cpu_to_node(cpu)) - numa_node = -1; + if (numa_node_id == -2) + numa_node_id = cpu_to_node(cpu); + else if (numa_node_id != cpu_to_node(cpu)) + numa_node_id = -1; } #endif if (need_set && pos >= map_len) { @@ -997,7 +997,7 @@ static ssize_t store_xps_map(struct netdev_queue *queue, if (dev_maps) kfree_rcu(dev_maps, rcu); - netdev_queue_numa_node_write(queue, (numa_node >= 0) ? numa_node : + netdev_queue_numa_node_write(queue, (numa_node_id >= 0) ? numa_node_id : NUMA_NO_NODE); mutex_unlock(&xps_map_mutex);