diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:37:39 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:37:39 +0200 |
commit | e6aa640eb2f68920cb849aec0cab44f05d843238 (patch) | |
tree | 42e07ee412112abe90d459f821e8d73c26cc648e /drivers/net/hyperv/netvsc_drv.c | |
parent | 1f573cce48a2ebb35953034062ef01056b7d6a58 (diff) | |
parent | d45331b00ddb179e291766617259261c112db872 (diff) | |
download | talos-op-linux-e6aa640eb2f68920cb849aec0cab44f05d843238.tar.gz talos-op-linux-e6aa640eb2f68920cb849aec0cab44f05d843238.zip |
Merge 5.3-rc4 into driver-core-next
We need the driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/hyperv/netvsc_drv.c')
-rw-r--r-- | drivers/net/hyperv/netvsc_drv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index afdcc5664ea6..3544e1991579 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -836,7 +836,6 @@ int netvsc_recv_callback(struct net_device *net, if (unlikely(!skb)) { ++net_device_ctx->eth_stats.rx_no_memory; - rcu_read_unlock(); return NVSP_STAT_FAIL; } |