diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-04 01:04:05 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-04 01:04:05 -0500 |
| commit | ca89bc248e2fac44d6374a48b8d38b068c7a1bdf (patch) | |
| tree | 0c10af2a5f22a1ad0283023d403022ce6b84ebc4 /net/core/dev.c | |
| parent | 9645083ca5ef365b7b750cf219bb20b61bb925f8 (diff) | |
| parent | 7b5bfb82882b9b1c8423ce0ed6852ca3762d967a (diff) | |
Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linus
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 65f829cfd928..3430b1ed12e5 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -1917,7 +1917,8 @@ static struct xps_map *expand_xps_map(struct xps_map *map, | |||
| 1917 | return new_map; | 1917 | return new_map; |
| 1918 | } | 1918 | } |
| 1919 | 1919 | ||
| 1920 | int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask, u16 index) | 1920 | int netif_set_xps_queue(struct net_device *dev, const struct cpumask *mask, |
| 1921 | u16 index) | ||
| 1921 | { | 1922 | { |
| 1922 | struct xps_dev_maps *dev_maps, *new_dev_maps = NULL; | 1923 | struct xps_dev_maps *dev_maps, *new_dev_maps = NULL; |
| 1923 | struct xps_map *map, *new_map; | 1924 | struct xps_map *map, *new_map; |