Skip to contentSkip to conversation

netif_set_xps_queue: make cpu mask const

PATCH In review Michael S. Tsirkin 2 participants 2 messages Oct 2, 2013

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Michael S. Tsirkin

author
#0 lore raw

PATCH 1/1 netif_set_xps_queue: make cpu mask const

virtio wants to pass in cpumask_of(cpu), make parameter const to avoid build warnings.

Signed-off-by Michael S. Tsirkin <[email protected]>
---
 include/linux/netdevice.h | 5 +++--
 net/core/dev.c            | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
include/linux/netdevice.h +3 -2
index 3de49ac..25f5d2d 100644
@@ -2264,11 +2264,12 @@ static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
 }
 
 #ifdef CONFIG_XPS
-extern int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask,
+extern int netif_set_xps_queue(struct net_device *dev,
+			       const struct cpumask *mask,
 			       u16 index);
 #else
 static inline int netif_set_xps_queue(struct net_device *dev,
-				      struct cpumask *mask,
+				      const struct cpumask *mask,
 				      u16 index)
 {
 	return 0;
net/core/dev.c +2 -1
index 5c713f2..f18eebd 100644
@@ -1917,7 +1917,8 @@ static struct xps_map *expand_xps_map(struct xps_map *map,
 	return new_map;
 }
 
-int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask, u16 index)
+int netif_set_xps_queue(struct net_device *dev, const struct cpumask *mask,
+			u16 index)
 {
 	struct xps_dev_maps *dev_maps, *new_dev_maps = NULL;
 	struct xps_map *map, *new_map;
Signature · 1 line
MST
maintainer
#1 lore raw

From: "Michael S. Tsirkin" <[email protected]>
Date: Wed, 2 Oct 2013 09:14:06 +0300

Quoted 4 lines

virtio wants to pass in cpumask_of(cpu), make parameter const to avoid build warnings.

Signed-off-by Michael S. Tsirkin <[email protected]>

Refresh my memory, is to accomodate a change you want to submit to 'net' or 'net-next'? This patch only applies to 'net' cleanly.