Page MenuHomeFreeBSD
Files F137105864

D5344.id13488.diff
No OneTemporary
Actions

D5344.id13488.diff
View Options

Index: sys/dev/hyperv/netvsc/hv_net_vsc.h
===================================================================
--- sys/dev/hyperv/netvsc/hv_net_vsc.h
+++ sys/dev/hyperv/netvsc/hv_net_vsc.h
@@ -1030,7 +1030,7 @@
int hn_sched_tx;
struct taskqueue *hn_tx_taskq;
- struct task hn_start_task;
+ struct task hn_tx_task;
struct task hn_txeof_task;
struct mtx hn_tx_lock;
Index: sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
===================================================================
--- sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
+++ sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
@@ -298,8 +298,8 @@
static void hn_destroy_tx_ring(struct hn_tx_ring *);
static int hn_create_tx_data(struct hn_softc *);
static void hn_destroy_tx_data(struct hn_softc *);
-static void hn_start_taskfunc(void *xsc, int pending);
-static void hn_txeof_taskfunc(void *xsc, int pending);
+static void hn_start_taskfunc(void *, int);
+static void hn_start_txeof_taskfunc(void *, int);
static void hn_stop_tx_tasks(struct hn_softc *);
static int hn_encap(struct hn_tx_ring *, struct hn_txdesc *, struct mbuf **);
static void hn_create_rx_data(struct hn_softc *sc);
@@ -1555,7 +1555,7 @@
return;
}
do_sched:
- taskqueue_enqueue(txr->hn_tx_taskq, &txr->hn_start_task);
+ taskqueue_enqueue(txr->hn_tx_taskq, &txr->hn_tx_task);
}
static void
@@ -1577,7 +1577,7 @@
mtx_unlock(&txr->hn_tx_lock);
if (sched) {
taskqueue_enqueue(txr->hn_tx_taskq,
- &txr->hn_start_task);
+ &txr->hn_tx_task);
}
} else {
do_sched:
@@ -2103,8 +2103,8 @@
#endif
txr->hn_tx_taskq = sc->hn_tx_taskq;
- TASK_INIT(&txr->hn_start_task, 0, hn_start_taskfunc, txr);
- TASK_INIT(&txr->hn_txeof_task, 0, hn_txeof_taskfunc, txr);
+ TASK_INIT(&txr->hn_tx_task, 0, hn_start_taskfunc, txr);
+ TASK_INIT(&txr->hn_txeof_task, 0, hn_start_txeof_taskfunc, txr);
txr->hn_direct_tx_size = hn_direct_tx_size;
if (hv_vmbus_protocal_version >= HV_VMBUS_VERSION_WIN8_1)
@@ -2399,7 +2399,7 @@
}
static void
-hn_txeof_taskfunc(void *xtxr, int pending __unused)
+hn_start_txeof_taskfunc(void *xtxr, int pending __unused)
{
struct hn_tx_ring *txr = xtxr;
@@ -2417,7 +2417,7 @@
for (i = 0; i < sc->hn_tx_ring_cnt; ++i) {
struct hn_tx_ring *txr = &sc->hn_tx_ring[i];
- taskqueue_drain(txr->hn_tx_taskq, &txr->hn_start_task);
+ taskqueue_drain(txr->hn_tx_taskq, &txr->hn_tx_task);
taskqueue_drain(txr->hn_tx_taskq, &txr->hn_txeof_task);
}
}

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 22, 3:52 AM (10 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25899133
Default Alt Text
D5344.id13488.diff (2 KB)

Event Timeline