D5346.1793812141.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D5346.1793812141.diff
View Options

	Index: head/sys/dev/hyperv/netvsc/hv_net_vsc.h
	===================================================================
	--- head/sys/dev/hyperv/netvsc/hv_net_vsc.h
	+++ head/sys/dev/hyperv/netvsc/hv_net_vsc.h
	@@ -1026,9 +1026,10 @@
	#endif
	int hn_txdesc_cnt;
	int hn_txdesc_avail;
	- int hn_txeof;
	+ int hn_has_txeof;

	int hn_sched_tx;
	+ void (hn_txeof)(struct hn_tx_ring );
	struct taskqueue *hn_tx_taskq;
	struct task hn_tx_task;
	struct task hn_txeof_task;
	Index: head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
	===================================================================
	--- head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
	+++ head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
	@@ -664,7 +664,7 @@
	packet->compl.send.send_completion_tid;

	txr = txd->txr;
	- txr->hn_txeof = 1;
	+ txr->hn_has_txeof = 1;
	hn_txdesc_put(txr, txd);
	}

	@@ -684,11 +684,11 @@
	}
	#endif

	- if (!txr->hn_txeof)
	+ if (!txr->hn_has_txeof)
	return;

	- txr->hn_txeof = 0;
	- hn_start_txeof(txr);
	+ txr->hn_has_txeof = 0;
	+ txr->hn_txeof(txr);
	}

	/*
	@@ -976,12 +976,12 @@
	* commands to run? Ask netvsc_channel_rollup()
	* to kick start later.
	*/
	- txr->hn_txeof = 1;
	+ txr->hn_has_txeof = 1;
	if (!send_failed) {
	txr->hn_send_failed++;
	send_failed = 1;
	/*
	- * Try sending again after set hn_txeof;
	+ * Try sending again after set hn_has_txeof;
	* in case that we missed the last
	* netvsc_channel_rollup().
	*/
	@@ -2111,6 +2111,8 @@
	*/
	txr->hn_sched_tx = 1;

	+ txr->hn_txeof = hn_start_txeof; /* TODO: if_transmit */
	+
	parent_dtag = bus_get_dma_tag(sc->hn_dev);

	/* DMA tag for RNDIS messages. */