From: Wei Liu Date: Thu, 10 Sep 2015 10:18:57 +0000 (+0100) Subject: xen-netback: respect user provided max_queues X-Git-Tag: v4.1.12-92~265^2~3 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=40b0bca4eef618182402cca872e99a7e511be1a5;p=users%2Fjedix%2Flinux-maple.git 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. Acked-by: Konrad Rzeszutek Wilk Reported-by: Johnny Strom Signed-off-by: Wei Liu Reviewed-by: David Vrabel Acked-by: Ian Campbell Signed-off-by: David S. Miller (cherry picked from commit 4c82ac3c37363e8c4ded6a5fe1ec5fa756b34df3) Signed-off-by: Annie Li --- diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index ef542c864792..4a939e1bbbd1 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) if (!xen_domain()) return -ENODEV; - /* Allow as many queues as there are CPUs, by default */ - xenvif_max_queues = num_online_cpus(); + /* Allow as many queues as there are CPUs if user has not + * specified a value. + */ + if (xenvif_max_queues == 0) + xenvif_max_queues = num_online_cpus(); if (fatal_skb_slots < XEN_NETBK_LEGACY_SLOTS_MAX) { pr_info("fatal_skb_slots too small (%d), bump it to XEN_NETBK_LEGACY_SLOTS_MAX (%d)\n",