diff options
| author | Haiyang Zhang <haiyangz@microsoft.com> | 2018-03-22 20:01:13 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-25 23:07:40 +0200 |
| commit | 5c71dadbb45970a8f0544a27ae8f1cbd9750e516 (patch) | |
| tree | 9508c9742c17828cd5ffeb058914d8e527657dc7 /drivers/net/hyperv/netvsc.c | |
| parent | Merge branch 'net-permit-skb_segment-on-head_frag-frag_list-skb' (diff) | |
| download | linux-5c71dadbb45970a8f0544a27ae8f1cbd9750e516.tar.xz linux-5c71dadbb45970a8f0544a27ae8f1cbd9750e516.zip | |
hv_netvsc: Fix the return status in RX path
As defined in hyperv_net.h, the NVSP_STAT_SUCCESS is one not zero.
Some functions returns 0 when it actually means NVSP_STAT_SUCCESS.
This patch fixes them.
In netvsc_receive(), it puts the last RNDIS packet's receive status
for all packets in a vmxferpage which may contain multiple RNDIS
packets.
This patch puts NVSP_STAT_FAIL in the receive completion if one of
the packets in a vmxferpage fails.
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv/netvsc.c')
| -rw-r--r-- | drivers/net/hyperv/netvsc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 4123d081b1c7..58bb2dcbc9f0 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -1098,12 +1098,16 @@ static int netvsc_receive(struct net_device *ndev, void *data = recv_buf + vmxferpage_packet->ranges[i].byte_offset; u32 buflen = vmxferpage_packet->ranges[i].byte_count; + int ret; trace_rndis_recv(ndev, q_idx, data); /* Pass it to the upper layer */ - status = rndis_filter_receive(ndev, net_device, - channel, data, buflen); + ret = rndis_filter_receive(ndev, net_device, + channel, data, buflen); + + if (unlikely(ret != NVSP_STAT_SUCCESS)) + status = NVSP_STAT_FAIL; } enq_receive_complete(ndev, net_device, q_idx, |