From: Haiyang Zhang Date: Mon, 14 May 2018 22:32:00 +0000 (-0700) Subject: hv_netvsc: Fix the real number of queues of non-vRSS cases X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=836f8472f1bded05ea4c35b07009f4fd6fcd6bfa;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git hv_netvsc: Fix the real number of queues of non-vRSS cases [ Commit 6450f8f269a9271985e4a8c13920b7e4cf21c0f3 upstream. ] For older hosts without multi-channel (vRSS) support, and some error cases, we still need to set the real number of queues to one. This patch adds this missing setting. Fixes: 8195b1396ec8 ("hv_netvsc: fix deadlock on hotplug") Signed-off-by: Haiyang Zhang Reviewed-by: Stephen Hemminger Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 444e560d928b..dff93f682435 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -1932,6 +1932,12 @@ static int netvsc_probe(struct hv_device *dev, /* We always need headroom for rndis header */ net->needed_headroom = RNDIS_AND_PPI_SIZE; + /* Initialize the number of queues to be 1, we may change it if more + * channels are offered later. + */ + netif_set_real_num_tx_queues(net, 1); + netif_set_real_num_rx_queues(net, 1); + /* Notify the netvsc driver of the new device */ memset(&device_info, 0, sizeof(device_info)); device_info.ring_size = ring_size;