diff options
| author | sephe <sephe@FreeBSD.org> | 2017-01-05 05:29:51 +0000 |
|---|---|---|
| committer | sephe <sephe@FreeBSD.org> | 2017-01-05 05:29:51 +0000 |
| commit | 99f5f3792287e6d35a7002cedbe2a09322d229cf (patch) | |
| tree | a56a84b08881c80ef6f934920342e4ccae253cb0 /sys/dev/hyperv/netvsc/hn_rndis.c | |
| parent | b5728fedd8bb5efa5e68aed3a7ffd3e536bc15f6 (diff) | |
| download | FreeBSD-src-99f5f3792287e6d35a7002cedbe2a09322d229cf.zip FreeBSD-src-99f5f3792287e6d35a7002cedbe2a09322d229cf.tar.gz | |
MFC 309226-309231,309235
309226
hyperv/hn: Utilize vmbus_chan_xact_wait
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D8612
309227
hyperv/hn: Fix detach error handling.
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D8613
309228
hyperv/hn: Fix multi-packet RNDIS message aggregation size setting.
Just in case that no chimney sending buffer can be used.
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D8619
309229
hyperv/hn: Fix attach error handling
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D8620
309230
hyperv/hn: Enable multi-packet RNDIS message support by default.
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D8621
309231
hyperv/hn: Fix vmbus_chan_subidx usage.
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D8629
309235
hyperv/hn: Simplify RSS indirect table fixup API
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D8630
Diffstat (limited to 'sys/dev/hyperv/netvsc/hn_rndis.c')
| -rw-r--r-- | sys/dev/hyperv/netvsc/hn_rndis.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/hyperv/netvsc/hn_rndis.c b/sys/dev/hyperv/netvsc/hn_rndis.c index fa749d3..198cc27 100644 --- a/sys/dev/hyperv/netvsc/hn_rndis.c +++ b/sys/dev/hyperv/netvsc/hn_rndis.c @@ -232,10 +232,8 @@ hn_rndis_xact_exec1(struct hn_softc *sc, struct vmbus_xact *xact, size_t reqlen, if_printf(sc->hn_ifp, "RNDIS ctrl send failed: %d\n", error); return (NULL); } - if (HN_CAN_SLEEP(sc)) - return (vmbus_xact_wait(xact, comp_len)); - else - return (vmbus_xact_busywait(xact, comp_len)); + return (vmbus_chan_xact_wait(sc->hn_prichan, xact, comp_len, + HN_CAN_SLEEP(sc))); } static const void * @@ -981,7 +979,6 @@ hn_rndis_attach(struct hn_softc *sc, int mtu) /* * Configure NDIS offload settings. - * XXX no offloading, if error happened? */ hn_rndis_conf_offload(sc, mtu); return (0); |
