Skip to content

Commit b236da6

Browse files
xiaosuodavem330
authored andcommitted
net: use NUMA_NO_NODE instead of the magic number -1
Signed-off-by: Changli Gao <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent caafa84 commit b236da6

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

include/linux/netdevice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ static inline int netdev_queue_numa_node_read(const struct netdev_queue *q)
530530
#if defined(CONFIG_XPS) && defined(CONFIG_NUMA)
531531
return q->numa_node;
532532
#else
533-
return -1;
533+
return NUMA_NO_NODE;
534534
#endif
535535
}
536536

net/core/dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5121,7 +5121,7 @@ static void netdev_init_one_queue(struct net_device *dev,
51215121
spin_lock_init(&queue->_xmit_lock);
51225122
netdev_set_xmit_lockdep_class(&queue->_xmit_lock, dev->type);
51235123
queue->xmit_lock_owner = -1;
5124-
netdev_queue_numa_node_write(queue, -1);
5124+
netdev_queue_numa_node_write(queue, NUMA_NO_NODE);
51255125
queue->dev = dev;
51265126
}
51275127

net/core/net-sysfs.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,8 @@ static ssize_t store_xps_map(struct netdev_queue *queue,
10091009
if (dev_maps)
10101010
call_rcu(&dev_maps->rcu, xps_dev_maps_release);
10111011

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);
10131014

10141015
mutex_unlock(&xps_map_mutex);
10151016

0 commit comments

Comments
 (0)