svn commit: r309226 - head/sys/dev/hyperv/netvsc

[Sepherosa Ziehau]

Author: sephe
Date: Mon Nov 28 05:15:28 2016
New Revision: 309226
URL: https://svnweb.freebsd.org/changeset/base/309226

Log:
  hyperv/hn: Utilize vmbus_chan_xact_wait
  
  MFC after:	1 week
  Sponsored by:	Microsoft
  Differential Revision:	https://reviews.freebsd.org/D8612

Modified:
  head/sys/dev/hyperv/netvsc/hn_nvs.c
  head/sys/dev/hyperv/netvsc/hn_rndis.c

Modified: head/sys/dev/hyperv/netvsc/hn_nvs.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/hn_nvs.c	Mon Nov 28 05:07:48 2016	(r309225)
+++ head/sys/dev/hyperv/netvsc/hn_nvs.c	Mon Nov 28 05:15:28 2016	(r309226)
@@ -109,10 +109,8 @@ hn_nvs_xact_execute(struct hn_softc *sc,
 		vmbus_xact_deactivate(xact);
 		return (NULL);
 	}
-	if (HN_CAN_SLEEP(sc))
-		hdr = vmbus_xact_wait(xact, &resplen);
-	else
-		hdr = vmbus_xact_busywait(xact, &resplen);
+	hdr = vmbus_chan_xact_wait(sc->hn_prichan, xact, &resplen,
+	    HN_CAN_SLEEP(sc));
 
 	/*
 	 * Check this NVS response message.

Modified: head/sys/dev/hyperv/netvsc/hn_rndis.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/hn_rndis.c	Mon Nov 28 05:07:48 2016	(r309225)
+++ head/sys/dev/hyperv/netvsc/hn_rndis.c	Mon Nov 28 05:15:28 2016	(r309226)
@@ -232,10 +232,8 @@ hn_rndis_xact_exec1(struct hn_softc *sc,
 		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 *