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>
This commit is contained in:
parent
74b4bed972
commit
5c71dadbb4
|
@ -1098,12 +1098,16 @@ static int netvsc_receive(struct net_device *ndev,
|
||||||
void *data = recv_buf
|
void *data = recv_buf
|
||||||
+ vmxferpage_packet->ranges[i].byte_offset;
|
+ vmxferpage_packet->ranges[i].byte_offset;
|
||||||
u32 buflen = vmxferpage_packet->ranges[i].byte_count;
|
u32 buflen = vmxferpage_packet->ranges[i].byte_count;
|
||||||
|
int ret;
|
||||||
|
|
||||||
trace_rndis_recv(ndev, q_idx, data);
|
trace_rndis_recv(ndev, q_idx, data);
|
||||||
|
|
||||||
/* Pass it to the upper layer */
|
/* Pass it to the upper layer */
|
||||||
status = rndis_filter_receive(ndev, net_device,
|
ret = rndis_filter_receive(ndev, net_device,
|
||||||
channel, data, buflen);
|
channel, data, buflen);
|
||||||
|
|
||||||
|
if (unlikely(ret != NVSP_STAT_SUCCESS))
|
||||||
|
status = NVSP_STAT_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
enq_receive_complete(ndev, net_device, q_idx,
|
enq_receive_complete(ndev, net_device, q_idx,
|
||||||
|
|
|
@ -831,7 +831,7 @@ int netvsc_recv_callback(struct net_device *net,
|
||||||
u64_stats_update_end(&rx_stats->syncp);
|
u64_stats_update_end(&rx_stats->syncp);
|
||||||
|
|
||||||
napi_gro_receive(&nvchan->napi, skb);
|
napi_gro_receive(&nvchan->napi, skb);
|
||||||
return 0;
|
return NVSP_STAT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void netvsc_get_drvinfo(struct net_device *net,
|
static void netvsc_get_drvinfo(struct net_device *net,
|
||||||
|
|
|
@ -437,10 +437,10 @@ int rndis_filter_receive(struct net_device *ndev,
|
||||||
"unhandled rndis message (type %u len %u)\n",
|
"unhandled rndis message (type %u len %u)\n",
|
||||||
rndis_msg->ndis_msg_type,
|
rndis_msg->ndis_msg_type,
|
||||||
rndis_msg->msg_len);
|
rndis_msg->msg_len);
|
||||||
break;
|
return NVSP_STAT_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return NVSP_STAT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rndis_filter_query_device(struct rndis_device *dev,
|
static int rndis_filter_query_device(struct rndis_device *dev,
|
||||||
|
|
Loading…
Reference in a new issue