diff options
| author | David S. Miller <davem@davemloft.net> | 2019-10-30 18:17:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-30 18:17:36 -0700 |
| commit | 3da09663209d6732c74cb7b6d5890b8dea9cf6f3 (patch) | |
| tree | f08ae7bc835932ecc0392bb56b16af8663ecde00 /drivers | |
| parent | fc89cc358fb64e2429aeae0f37906126636507ec (diff) | |
| parent | 719b85c336ed35565d0f3982269d6f684087bb00 (diff) | |
Merge branch 'hv_netvsc-fix-error-handling-in-netvsc_attach-set_features'
Haiyang Zhang says:
====================
hv_netvsc: fix error handling in netvsc_attach/set_features
The error handling code path in these functions are not correct.
This patch set fixes them.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/hyperv/netvsc_drv.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index fd4fff57fd6e..963509add611 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -982,7 +982,7 @@ static int netvsc_attach(struct net_device *ndev, if (netif_running(ndev)) { ret = rndis_filter_open(nvdev); if (ret) - return ret; + goto err; rdev = nvdev->extension; if (!rdev->link_state) @@ -990,6 +990,13 @@ static int netvsc_attach(struct net_device *ndev, } return 0; + +err: + netif_device_detach(ndev); + + rndis_filter_device_remove(hdev, nvdev); + + return ret; } static int netvsc_set_channels(struct net_device *net, @@ -1807,8 +1814,10 @@ static int netvsc_set_features(struct net_device *ndev, ret = rndis_filter_set_offload_params(ndev, nvdev, &offloads); - if (ret) + if (ret) { features ^= NETIF_F_LRO; + ndev->features = features; + } syncvf: if (!vf_netdev) |