summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWei Liu <wei.liu2@citrix.com>2015-09-10 13:18:58 +0300
committerDavid S. Miller <davem@davemloft.net>2015-09-10 20:11:48 +0300
commit32a844056fd43dda647e1c3c6b9983bdfa04d17d (patch)
treefdea592e172cb0958a58f0f6d909f3a043752119 /drivers
parent4c82ac3c37363e8c4ded6a5fe1ec5fa756b34df3 (diff)
downloadlinux-32a844056fd43dda647e1c3c6b9983bdfa04d17d.tar.xz
xen-netfront: 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. Signed-off-by: Wei Liu <wei.liu2@citrix.com> Cc: David Vrabel <david.vrabel@citrix.com> Reviewed-by: David Vrabel <david.vrabel@citrix.com> Tested-by: David Vrabel <david.vrabel@citrix.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/xen-netfront.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index e27e6d2ea6d2..b9c637a0036b 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -2132,8 +2132,11 @@ static int __init netif_init(void)
pr_info("Initialising Xen virtual ethernet driver\n");
- /* Allow as many queues as there are CPUs, by default */
- xennet_max_queues = num_online_cpus();
+ /* Allow as many queues as there are CPUs if user has not
+ * specified a value.
+ */
+ if (xennet_max_queues == 0)
+ xennet_max_queues = num_online_cpus();
return xenbus_register_frontend(&netfront_driver);
}