From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 14 Mar 2019 17:16:16 +0000 (+0800)
Subject: hv/netvsc: fix handling of fallback to single queue mode
X-Git-Tag: Ubuntu-4.15.0-48.51~176
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6acec6fafe2e07d83246a6906cbe968db3d63ef0;p=mirror_ubuntu-bionic-kernel.git

hv/netvsc: fix handling of fallback to single queue mode

BugLink: https://bugs.launchpad.net/bugs/1814069

The netvsc device may need to fallback to running in single queue
mode if host side only wants to support single queue.

Recent change for handling mtu broke this in setup logic.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: 3ffe64f1a641 ("hv_netvsc: split sub-channel setup into async and sync")
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 916c5e1413be058d1c1f6e502db350df890730ce)
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Acked-by: You-Sheng Yang <vicamo.yang@canonical.com>
Acked-by: Kleber Souza <kleber.souza@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
---

diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 3857df77771a..d9f75289cd0a 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -1299,6 +1299,7 @@ out:
 	/* setting up multiple channels failed */
 	net_device->max_chn = 1;
 	net_device->num_chn = 1;
+	return 0;
 
 err_dev_remv:
 	rndis_filter_device_remove(dev, net_device);