Browse Source

net: use NUMA_NO_NODE instead of the magic number -1

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Changli Gao 14 years ago
parent
commit
b236da6931
3 changed files with 4 additions and 3 deletions
  1. 1 1
      include/linux/netdevice.h
  2. 1 1
      net/core/dev.c
  3. 2 1
      net/core/net-sysfs.c

+ 1 - 1
include/linux/netdevice.h

@@ -530,7 +530,7 @@ static inline int netdev_queue_numa_node_read(const struct netdev_queue *q)
 #if defined(CONFIG_XPS) && defined(CONFIG_NUMA)
 #if defined(CONFIG_XPS) && defined(CONFIG_NUMA)
 	return q->numa_node;
 	return q->numa_node;
 #else
 #else
-	return -1;
+	return NUMA_NO_NODE;
 #endif
 #endif
 }
 }
 
 

+ 1 - 1
net/core/dev.c

@@ -5121,7 +5121,7 @@ static void netdev_init_one_queue(struct net_device *dev,
 	spin_lock_init(&queue->_xmit_lock);
 	spin_lock_init(&queue->_xmit_lock);
 	netdev_set_xmit_lockdep_class(&queue->_xmit_lock, dev->type);
 	netdev_set_xmit_lockdep_class(&queue->_xmit_lock, dev->type);
 	queue->xmit_lock_owner = -1;
 	queue->xmit_lock_owner = -1;
-	netdev_queue_numa_node_write(queue, -1);
+	netdev_queue_numa_node_write(queue, NUMA_NO_NODE);
 	queue->dev = dev;
 	queue->dev = dev;
 }
 }
 
 

+ 2 - 1
net/core/net-sysfs.c

@@ -1009,7 +1009,8 @@ static ssize_t store_xps_map(struct netdev_queue *queue,
 	if (dev_maps)
 	if (dev_maps)
 		call_rcu(&dev_maps->rcu, xps_dev_maps_release);
 		call_rcu(&dev_maps->rcu, xps_dev_maps_release);
 
 
-	netdev_queue_numa_node_write(queue, (numa_node >= 0) ? numa_node : -1);
+	netdev_queue_numa_node_write(queue, (numa_node >= 0) ? numa_node :
+					    NUMA_NO_NODE);
 
 
 	mutex_unlock(&xps_map_mutex);
 	mutex_unlock(&xps_map_mutex);