summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaiyang Zhang2019-07-19 19:33:51 +0200
committerGreg Kroah-Hartman2019-07-28 08:29:23 +0200
commit9770fe1b202f423e69e415a695c46c6a1a2a9a02 (patch)
treeb5d9d92e69461c957082e47f1f87f9892bf99cc0
parentcaif-hsi: fix possible deadlock in cfhsi_exit_module() (diff)
downloadkernel-qcow2-linux-9770fe1b202f423e69e415a695c46c6a1a2a9a02.tar.gz
kernel-qcow2-linux-9770fe1b202f423e69e415a695c46c6a1a2a9a02.tar.xz
kernel-qcow2-linux-9770fe1b202f423e69e415a695c46c6a1a2a9a02.zip
hv_netvsc: Fix extra rcu_read_unlock in netvsc_recv_callback()
[ Upstream commit be4363bdf0ce9530f15aa0a03d1060304d116b15 ] There is an extra rcu_read_unlock left in netvsc_recv_callback(), after a previous patch that removes RCU from this function. This patch removes the extra RCU unlock. Fixes: 345ac08990b8 ("hv_netvsc: pass netvsc_device to receive callback") Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/hyperv/netvsc_drv.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index cf6b9b1771f1..cc60ef9634db 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -847,7 +847,6 @@ int netvsc_recv_callback(struct net_device *net,
csum_info, vlan, data, len);
if (unlikely(!skb)) {
++net_device_ctx->eth_stats.rx_no_memory;
- rcu_read_unlock();
return NVSP_STAT_FAIL;
}