From: Wei Liu <wei.liu2@citrix.com>
Date: Thu, 10 Sep 2015 10:18:58 +0000 (+0100)
Subject: xen-netfront: respect user provided max_queues
X-Git-Tag: v3.16.35~674
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01e9c91271f523344ce3dc91b97514627756ed13;p=thirdparty%2Fkernel%2Fstable.git

xen-netfront: respect user provided max_queues

commit 32a844056fd43dda647e1c3c6b9983bdfa04d17d upstream.

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>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 9d3bdea182cd9..2fb7f5d236088 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -2405,8 +2405,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);
 }