Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / hv / hv_utils.c

diff --git a/drivers/staging/hv/hv_utils.c b/drivers/staging/hv/hv_utils.c
index 6eb79febef9b345c631576f840f6d63378a3e78a..a99e900ec4c9faf8f5f96aa815cc3af5d01766c1 100644 (file)
--- a/drivers/staging/hv/hv_utils.c
+++ b/drivers/staging/hv/hv_utils.c
@@ -55,7 +55,7 @@ static void shutdown_onchannelcallback(void *context)
        buflen = PAGE_SIZE;
        buf = kmalloc(buflen, GFP_ATOMIC);
 
-       VmbusChannelRecvPacket(channel, buf, buflen, &recvlen, &requestid);
+       vmbus_recvpacket(channel, buf, buflen, &recvlen, &requestid);
 
        if (recvlen > 0) {
                DPRINT_DBG(VMBUS, "shutdown packet: len=%d, requestid=%lld",
@@ -93,7 +93,7 @@ static void shutdown_onchannelcallback(void *context)
                icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION
                        | ICMSGHDRFLAG_RESPONSE;
 
-               VmbusChannelSendPacket(channel, buf,
+               vmbus_sendpacket(channel, buf,
                                       recvlen, requestid,
                                       VmbusPacketTypeDataInBand, 0);
        }
@@ -159,7 +159,7 @@ static void timesync_onchannelcallback(void *context)
        buflen = PAGE_SIZE;
        buf = kmalloc(buflen, GFP_ATOMIC);
 
-       VmbusChannelRecvPacket(channel, buf, buflen, &recvlen, &requestid);
+       vmbus_recvpacket(channel, buf, buflen, &recvlen, &requestid);
 
        if (recvlen > 0) {
                DPRINT_DBG(VMBUS, "timesync packet: recvlen=%d, requestid=%lld",
@@ -180,7 +180,7 @@ static void timesync_onchannelcallback(void *context)
                icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION
                        | ICMSGHDRFLAG_RESPONSE;
 
-               VmbusChannelSendPacket(channel, buf,
+               vmbus_sendpacket(channel, buf,
                                recvlen, requestid,
                                VmbusPacketTypeDataInBand, 0);
        }
@@ -205,15 +205,12 @@ static void heartbeat_onchannelcallback(void *context)
        buflen = PAGE_SIZE;
        buf = kmalloc(buflen, GFP_ATOMIC);
 
-       VmbusChannelRecvPacket(channel, buf, buflen, &recvlen, &requestid);
+       vmbus_recvpacket(channel, buf, buflen, &recvlen, &requestid);
 
        if (recvlen > 0) {
                DPRINT_DBG(VMBUS, "heartbeat packet: len=%d, requestid=%lld",
                           recvlen, requestid);
 
-               icmsghdrp = (struct icmsg_hdr *)&buf[
-                       sizeof(struct vmbuspipe_hdr)];
-
                icmsghdrp = (struct icmsg_hdr *)&buf[
                                sizeof(struct vmbuspipe_hdr)];
 
@@ -233,7 +230,7 @@ static void heartbeat_onchannelcallback(void *context)
                icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION
                        | ICMSGHDRFLAG_RESPONSE;
 
-               VmbusChannelSendPacket(channel, buf,
+               vmbus_sendpacket(channel, buf,
                                       recvlen, requestid,
                                       VmbusPacketTypeDataInBand, 0);
        }