netvsc: Deal with rescinded channels correctly

We will not be able to send packets over a channel that has been
rescinded. Make necessary adjustments so we can properly cleanup
even when the channel is rescinded. This issue can be trigerred
in the NIC hot-remove path.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index fd21d5aab580072c74c4e1efc219ebfcd98706a6..967843ba03fa41d5cb2c9a46c5c5e3d6e5a3ff51 100644 (file)
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -135,6 +135,13 @@ static void netvsc_destroy_buf(struct hv_device *device)
                                       sizeof(struct nvsp_message),
                                       (unsigned long)revoke_packet,
                                       VM_PKT_DATA_INBAND, 0);
+               /* If the failure is because the channel is rescinded;
+                * ignore the failure since we cannot send on a rescinded
+                * channel. This would allow us to properly cleanup
+                * even when the channel is rescinded.
+                */
+               if (device->channel->rescind)
+                       ret = 0;
                /*
                 * If we failed here, we might as well return and
                 * have a leak rather than continue and a bugchk
@@ -195,6 +202,15 @@ static void netvsc_destroy_buf(struct hv_device *device)
                                       sizeof(struct nvsp_message),
                                       (unsigned long)revoke_packet,
                                       VM_PKT_DATA_INBAND, 0);
+
+               /* If the failure is because the channel is rescinded;
+                * ignore the failure since we cannot send on a rescinded
+                * channel. This would allow us to properly cleanup
+                * even when the channel is rescinded.
+                */
+               if (device->channel->rescind)
+                       ret = 0;
+
                /* If we failed here, we might as well return and
                 * have a leak rather than continue and a bugchk
                 */