diff options
| author | Haiyang Zhang <haiyangz@microsoft.com> | 2014-12-01 22:28:39 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-09 02:24:11 +0100 |
| commit | c3582a2c4d0baf1fa3955c8b3d3d61308df474c7 (patch) | |
| tree | bcff2477cb791564cd2189026c088ec69b1ee217 /drivers/net/hyperv | |
| parent | test: bpf: expand DIV_KX to DIV_MOD_KX (diff) | |
| download | linux-c3582a2c4d0baf1fa3955c8b3d3d61308df474c7.tar.xz linux-c3582a2c4d0baf1fa3955c8b3d3d61308df474c7.zip | |
hyperv: Add support for vNIC hot removal
This patch adds proper handling of the vNIC hot removal event, which includes
a rescind-channel-offer message from the host side that triggers vNIC close and
removal. In this case, the notices to the host during close and removal is not
necessary because the channel is rescinded. This patch blocks these unnecessary
messages, and lets vNIC removal process complete normally.
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv')
| -rw-r--r-- | drivers/net/hyperv/netvsc.c | 3 | ||||
| -rw-r--r-- | drivers/net/hyperv/rndis_filter.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 6fc834e4306d..dd867e6cabd6 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -764,6 +764,9 @@ int netvsc_send(struct hv_device *device, out_channel = device->channel; packet->channel = out_channel; + if (out_channel->rescind) + return -ENODEV; + if (packet->page_buf_cnt) { ret = vmbus_sendpacket_pagebuffer(out_channel, packet->page_buf, diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c index 7b2c5d1e9bad..ec0c40a8f653 100644 --- a/drivers/net/hyperv/rndis_filter.c +++ b/drivers/net/hyperv/rndis_filter.c @@ -958,6 +958,9 @@ static int rndis_filter_close_device(struct rndis_device *dev) return 0; ret = rndis_filter_set_packet_filter(dev, 0); + if (ret == -ENODEV) + ret = 0; + if (ret == 0) dev->state = RNDIS_DEV_INITIALIZED; |