Page MenuHomeFreeBSD
Files F144782237

D7517.id.diff
No OneTemporary
Actions

D7517.id.diff
View Options

Index: head/sys/dev/hyperv/netvsc/hv_net_vsc.c
===================================================================
--- head/sys/dev/hyperv/netvsc/hv_net_vsc.c
+++ head/sys/dev/hyperv/netvsc/hv_net_vsc.c
@@ -852,7 +852,7 @@
netvsc_packet *net_vsc_pkt = &vsc_pkt;
int count = 0;
int i = 0;
- int status = nvsp_status_success;
+ int status = HN_NVS_STATUS_OK;
/* Make sure that this is a RNDIS message. */
nvs_hdr = VMBUS_CHANPKT_CONST_DATA(pkthdr);
@@ -874,15 +874,16 @@
/* Each range represents 1 RNDIS pkt that contains 1 Ethernet frame */
for (i = 0; i < count; i++) {
- net_vsc_pkt->status = nvsp_status_success;
+ net_vsc_pkt->status = HN_NVS_STATUS_OK;
net_vsc_pkt->data = ((uint8_t *)net_dev->rx_buf +
pkt->cp_rxbuf[i].rb_ofs);
net_vsc_pkt->tot_data_buf_len = pkt->cp_rxbuf[i].rb_len;
hv_rf_on_receive(net_dev, rxr, net_vsc_pkt);
- if (net_vsc_pkt->status != nvsp_status_success) {
- status = nvsp_status_failure;
- }
+
+ /* XXX pretty broken; whack it */
+ if (net_vsc_pkt->status != HN_NVS_STATUS_OK)
+ status = HN_NVS_STATUS_FAILED;
}
/*
Index: head/sys/dev/hyperv/netvsc/hv_rndis_filter.c
===================================================================
--- head/sys/dev/hyperv/netvsc/hv_rndis_filter.c
+++ head/sys/dev/hyperv/netvsc/hv_rndis_filter.c
@@ -544,7 +544,7 @@
pkt->tot_data_buf_len -= data_offset;
if (pkt->tot_data_buf_len < rndis_pkt->data_length) {
- pkt->status = nvsp_status_failure;
+ pkt->status = HN_NVS_STATUS_FAILED;
if_printf(rxr->hn_ifp,
"total length %u is less than data length %u\n",
pkt->tot_data_buf_len, rndis_pkt->data_length);
@@ -555,7 +555,7 @@
pkt->data = (void *)((unsigned long)pkt->data + data_offset);
if (hv_rf_find_recvinfo(rndis_pkt, &info)) {
- pkt->status = nvsp_status_failure;
+ pkt->status = HN_NVS_STATUS_FAILED;
if_printf(rxr->hn_ifp, "recvinfo parsing failed\n");
return;
}
@@ -580,13 +580,13 @@
/* Make sure the rndis device state is initialized */
if (net_dev->extension == NULL) {
- pkt->status = nvsp_status_failure;
+ pkt->status = HN_NVS_STATUS_FAILED;
return (ENODEV);
}
rndis_dev = (rndis_device *)net_dev->extension;
if (rndis_dev->state == RNDIS_DEV_UNINITIALIZED) {
- pkt->status = nvsp_status_failure;
+ pkt->status = HN_NVS_STATUS_FAILED;
return (EINVAL);
}

File Metadata

Mime Type
text/plain
Expires
Fri, Feb 13, 12:20 PM (12 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28676938
Default Alt Text
D7517.id.diff (2 KB)

Event Timeline