Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[karo-tx-linux.git] / include / linux / netdevice.h

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 6d77e0f3cc102c3ef7f3d5fa0bec1f9c59f6b598..2e53b44454ad808332ffc67b2af9b9426ab3cff6 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2273,11 +2273,11 @@ static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
 }
 
 #ifdef CONFIG_XPS
-int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask,
+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;