diff options
author | Wei Liu <wei.liu2@citrix.com> | 2015-09-10 06:18:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-09-10 13:11:48 -0400 |
commit | 4c82ac3c37363e8c4ded6a5fe1ec5fa756b34df3 (patch) | |
tree | 04627a9acfd0dfb8f56d69bdb9d24e976d82cbc1 /drivers/net | |
parent | 420203204eada39cfe0e8eb65e609da7b209cf33 (diff) |
xen-netback: respect user provided max_queues
Originally that parameter was always reset to num_online_cpus during
module initialisation, which renders it useless.
The fix is to only set max_queues to num_online_cpus when user has not
provided a value.
Reported-by: Johnny Strom <johnny.strom@linuxsolutions.fi>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/xen-netback/netback.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index b588b1a08cd4..abc1381264fc 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c | |||
@@ -2114,8 +2114,11 @@ static int __init netback_init(void) | |||
2114 | if (!xen_domain()) | 2114 | if (!xen_domain()) |
2115 | return -ENODEV; | 2115 | return -ENODEV; |
2116 | 2116 | ||
2117 | /* Allow as many queues as there are CPUs, by default */ | 2117 | /* Allow as many queues as there are CPUs if user has not |
2118 | xenvif_max_queues = num_online_cpus(); | 2118 | * specified a value. |
2119 | */ | ||
2120 | if (xenvif_max_queues == 0) | ||
2121 | xenvif_max_queues = num_online_cpus(); | ||
2119 | 2122 | ||
2120 | if (fatal_skb_slots < XEN_NETBK_LEGACY_SLOTS_MAX) { | 2123 | if (fatal_skb_slots < XEN_NETBK_LEGACY_SLOTS_MAX) { |
2121 | pr_info("fatal_skb_slots too small (%d), bump it to XEN_NETBK_LEGACY_SLOTS_MAX (%d)\n", | 2124 | pr_info("fatal_skb_slots too small (%d), bump it to XEN_NETBK_LEGACY_SLOTS_MAX (%d)\n", |