diff options
| author | Michal Marek | 2010-12-14 22:01:55 +0100 |
|---|---|---|
| committer | Michal Marek | 2010-12-14 22:01:55 +0100 |
| commit | 8990c1bc4be46473ad19bf2fa612ca57286f3df4 (patch) | |
| tree | 3cea60576903a1d26c67e6ec62891b524d390e95 /drivers/staging/hv/hv_utils.c | |
| parent | headers_install: check exit status of unifdef (diff) | |
| parent | Linux 2.6.37-rc1 (diff) | |
| download | kernel-qcow2-linux-8990c1bc4be46473ad19bf2fa612ca57286f3df4.tar.gz kernel-qcow2-linux-8990c1bc4be46473ad19bf2fa612ca57286f3df4.tar.xz kernel-qcow2-linux-8990c1bc4be46473ad19bf2fa612ca57286f3df4.zip | |
Merge commit 'v2.6.37-rc1' into kbuild/kbuild
Diffstat (limited to 'drivers/staging/hv/hv_utils.c')
| -rw-r--r-- | drivers/staging/hv/hv_utils.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/drivers/staging/hv/hv_utils.c b/drivers/staging/hv/hv_utils.c index 2adc9b48ca9c..702a478d5542 100644 --- a/drivers/staging/hv/hv_utils.c +++ b/drivers/staging/hv/hv_utils.c @@ -52,12 +52,10 @@ static void shutdown_onchannelcallback(void *context) struct icmsg_hdr *icmsghdrp; struct icmsg_negotiate *negop = NULL; - DPRINT_ENTER(VMBUS); - 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", @@ -95,15 +93,13 @@ static void shutdown_onchannelcallback(void *context) icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION | ICMSGHDRFLAG_RESPONSE; - VmbusChannelSendPacket(channel, buf, + vmbus_sendpacket(channel, buf, recvlen, requestid, VmbusPacketTypeDataInBand, 0); } kfree(buf); - DPRINT_EXIT(VMBUS); - if (execute_shutdown == true) orderly_poweroff(false); } @@ -160,12 +156,10 @@ static void timesync_onchannelcallback(void *context) struct icmsg_hdr *icmsghdrp; struct ictimesync_data *timedatap; - DPRINT_ENTER(VMBUS); - 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", @@ -186,14 +180,12 @@ static void timesync_onchannelcallback(void *context) icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION | ICMSGHDRFLAG_RESPONSE; - VmbusChannelSendPacket(channel, buf, + vmbus_sendpacket(channel, buf, recvlen, requestid, VmbusPacketTypeDataInBand, 0); } kfree(buf); - - DPRINT_EXIT(VMBUS); } /* @@ -210,12 +202,10 @@ static void heartbeat_onchannelcallback(void *context) struct icmsg_hdr *icmsghdrp; struct heartbeat_msg_data *heartbeat_msg; - DPRINT_ENTER(VMBUS); - 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", @@ -243,14 +233,12 @@ static void heartbeat_onchannelcallback(void *context) icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION | ICMSGHDRFLAG_RESPONSE; - VmbusChannelSendPacket(channel, buf, + vmbus_sendpacket(channel, buf, recvlen, requestid, VmbusPacketTypeDataInBand, 0); } kfree(buf); - - DPRINT_EXIT(VMBUS); } static const struct pci_device_id __initconst |