From 86762690990046e732915e2d295f9c2710dfb356 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 21 Oct 2010 08:48:19 -0700
Subject: [PATCH] --- yaml --- r: 220415 b: refs/heads/master c:
 81f162035745b59d0defd210751d52c20d4b6746 h: refs/heads/master i:   220413:
 e8f6a288f571943efac1458669e99df396c0ab2b   220411:
 bc0ed962dc0cd041965d77f9df4cce0ba7c26eff   220407:
 3aa46e12657816f0bcfc6424599109034376d1c4   220399:
 ce30ef0e7c11edee0b75f6a62e48a6c639651a4b   220383:
 17ec498931d26b66ea2a2daad5cc760b7d24eb57   220351:
 2637c1302711c101ca877b7268d1306ea7fed0fe   220287:
 57703bba4491da7e369f5a6ea549cd793717d566   220159:
 4685ed635471d8aa5776a0d8cddff8179e2c5645 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/staging/hv/netvsc.c | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 72177fe3efe1..105b2084d569 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98873724aa3957f27f35a82f20c85262fae42f0d
+refs/heads/master: 81f162035745b59d0defd210751d52c20d4b6746
diff --git a/trunk/drivers/staging/hv/netvsc.c b/trunk/drivers/staging/hv/netvsc.c
index 4fc0fd9efad6..4c29c31ad3a5 100644
--- a/trunk/drivers/staging/hv/netvsc.c
+++ b/trunk/drivers/staging/hv/netvsc.c
@@ -240,10 +240,9 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
 	 * channel.  Note: This call uses the vmbus connection rather
 	 * than the channel to establish the gpadl handle.
 	 */
-	ret = Device->Driver->VmbusChannelInterface.EstablishGpadl(Device,
-					netDevice->ReceiveBuffer,
-					netDevice->ReceiveBufferSize,
-					&netDevice->ReceiveBufferGpadlHandle);
+	ret = vmbus_establish_gpadl(Device->context, netDevice->ReceiveBuffer,
+				    netDevice->ReceiveBufferSize,
+				    &netDevice->ReceiveBufferGpadlHandle);
 	if (ret != 0) {
 		DPRINT_ERR(NETVSC,
 			   "unable to establish receive buffer's gpadl");
@@ -369,10 +368,9 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)
 	 * channel.  Note: This call uses the vmbus connection rather
 	 * than the channel to establish the gpadl handle.
 	 */
-	ret = Device->Driver->VmbusChannelInterface.EstablishGpadl(Device,
-					netDevice->SendBuffer,
-					netDevice->SendBufferSize,
-					&netDevice->SendBufferGpadlHandle);
+	ret = vmbus_establish_gpadl(Device->context, netDevice->SendBuffer,
+				    netDevice->SendBufferSize,
+				    &netDevice->SendBufferGpadlHandle);
 	if (ret != 0) {
 		DPRINT_ERR(NETVSC, "unable to establish send buffer's gpadl");
 		goto Cleanup;