aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/netdevice.h2
-rw-r--r--net/core/dev.c2
-rw-r--r--net/core/net-sysfs.c3
3 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 445e6825f8eb..cc916c5c3279 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -530,7 +530,7 @@ static inline int netdev_queue_numa_node_read(const struct netdev_queue *q)
530#if defined(CONFIG_XPS) && defined(CONFIG_NUMA) 530#if defined(CONFIG_XPS) && defined(CONFIG_NUMA)
531 return q->numa_node; 531 return q->numa_node;
532#else 532#else
533 return -1; 533 return NUMA_NO_NODE;
534#endif 534#endif
535} 535}
536 536
diff --git a/net/core/dev.c b/net/core/dev.c
index b25dd087f06a..7ac26d2b9722 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5121,7 +5121,7 @@ static void netdev_init_one_queue(struct net_device *dev,
5121 spin_lock_init(&queue->_xmit_lock); 5121 spin_lock_init(&queue->_xmit_lock);
5122 netdev_set_xmit_lockdep_class(&queue->_xmit_lock, dev->type); 5122 netdev_set_xmit_lockdep_class(&queue->_xmit_lock, dev->type);
5123 queue->xmit_lock_owner = -1; 5123 queue->xmit_lock_owner = -1;
5124 netdev_queue_numa_node_write(queue, -1); 5124 netdev_queue_numa_node_write(queue, NUMA_NO_NODE);
5125 queue->dev = dev; 5125 queue->dev = dev;
5126} 5126}
5127 5127
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 85e8b5326dd6..e23c01be5a5b 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -1009,7 +1009,8 @@ static ssize_t store_xps_map(struct netdev_queue *queue,
1009 if (dev_maps) 1009 if (dev_maps)
1010 call_rcu(&dev_maps->rcu, xps_dev_maps_release); 1010 call_rcu(&dev_maps->rcu, xps_dev_maps_release);
1011 1011
1012 netdev_queue_numa_node_write(queue, (numa_node >= 0) ? numa_node : -1); 1012 netdev_queue_numa_node_write(queue, (numa_node >= 0) ? numa_node :
1013 NUMA_NO_NODE);
1013 1014
1014 mutex_unlock(&xps_map_mutex); 1015 mutex_unlock(&xps_map_mutex);
1015 1016