hv_netvsc: Use Windows version instead of NVSP version on GPAD teardown

commit 2afc5d61a7197de25a61f54ea4ecfb4cb62b1d42A upstram

When changing network interface settings, Windows guests
older than WS2016 can no longer shutdown. This was addressed
by commit 0ef58b0a05c12 ("hv_netvsc: change GPAD teardown order
on older versions"), however the issue also occurs on WS2012
guests that share NVSP protocol versions with WS2016 guests.
Hence we use Windows version directly to differentiate them.

Fixes: 0ef58b0a05c12 ("hv_netvsc: change GPAD teardown order on older versions")
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 0c548748fba83950db5bac9a40195692eb14eac4..aa9b7a912c3161dfbea8bae64aaa5b6ebe4e5a35 100644 (file)
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -569,13 +569,13 @@ void netvsc_device_remove(struct hv_device *device)
        netdev_dbg(ndev, "net device safe to remove\n");
 
        /* older versions require that buffer be revoked before close */
-       if (net_device->nvsp_version < NVSP_PROTOCOL_VERSION_4)
+       if (vmbus_proto_version < VERSION_WIN10)
                netvsc_teardown_gpadl(device, net_device);
 
        /* Now, we can close the channel safely */
        vmbus_close(device->channel);
 
-       if (net_device->nvsp_version >= NVSP_PROTOCOL_VERSION_4)
+       if (vmbus_proto_version >= VERSION_WIN10)
                netvsc_teardown_gpadl(device, net_device);
 
        /* Release all resources */