diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-05-23 21:19:17 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-05-23 21:19:17 -0700 |
| commit | 677fb7525331375ba2f90f4bc94a80b9b6e697a3 (patch) | |
| tree | d7b9574e487930977c240c5503a3103e32e41cec /drivers/net/hyperv | |
| parent | 1ef0736c0711e2633a59b540931406de626f2836 (diff) | |
| parent | 7fb0269720d7d5359bc8349eef908a1c96866b65 (diff) | |
| download | linux-677fb7525331375ba2f90f4bc94a80b9b6e697a3.tar.gz linux-677fb7525331375ba2f90f4bc94a80b9b6e697a3.tar.bz2 linux-677fb7525331375ba2f90f4bc94a80b9b6e697a3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ethernet/cadence/macb_main.c
5cebb40bc955 ("net: macb: Fix PTP one step sync support")
138badbc21a0 ("net: macb: use NAPI for TX completion path")
https://lore.kernel.org/all/20220523111021.31489367@canb.auug.org.au/
net/smc/af_smc.c
75c1edf23b95 ("net/smc: postpone sk_refcnt increment in connect()")
3aba103006bc ("net/smc: align the connect behaviour with TCP")
https://lore.kernel.org/all/20220524114408.4bf1af38@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/hyperv')
| -rw-r--r-- | drivers/net/hyperv/netvsc_drv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 27f6bbca6619..15ebd5426604 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -2643,7 +2643,10 @@ static int netvsc_suspend(struct hv_device *dev) /* Save the current config info */ ndev_ctx->saved_netvsc_dev_info = netvsc_devinfo_get(nvdev); - + if (!ndev_ctx->saved_netvsc_dev_info) { + ret = -ENOMEM; + goto out; + } ret = netvsc_detach(net, nvdev); out: rtnl_unlock(); |