From e003068998efecfdf227003aab9eff1f370d5e68 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 10 May 2011 07:55:23 -0700 Subject: [PATCH] --- yaml --- r: 249539 b: refs/heads/master c: 633c4dce4e822be6155a78cec488e8bde521e908 h: refs/heads/master i: 249537: 6df2754f74ef3069f8a3150dbb78d9182b04576b 249535: f18d996d0a9ac912c66b347cd1c0d2293483c4cb v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/channel.c | 6 +++--- trunk/drivers/staging/hv/ring_buffer.c | 4 ++-- trunk/drivers/staging/hv/ring_buffer.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 0c40fd7bbc13..a6582d35fc78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2dba688ba4238066400d5b6b35d5b4ce9484b4b1 +refs/heads/master: 633c4dce4e822be6155a78cec488e8bde521e908 diff --git a/trunk/drivers/staging/hv/channel.c b/trunk/drivers/staging/hv/channel.c index 44b81e897aa2..859771c01611 100644 --- a/trunk/drivers/staging/hv/channel.c +++ b/trunk/drivers/staging/hv/channel.c @@ -718,7 +718,7 @@ int vmbus_sendpacket(struct vmbus_channel *channel, const void *buffer, sg_set_buf(&bufferlist[2], &aligned_data, packetlen_aligned - packetlen); - ret = ringbuffer_write(&channel->outbound, bufferlist, 3); + ret = hv_ringbuffer_write(&channel->outbound, bufferlist, 3); /* TODO: We should determine if this is optional */ if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound)) @@ -783,7 +783,7 @@ int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel, sg_set_buf(&bufferlist[2], &aligned_data, packetlen_aligned - packetlen); - ret = ringbuffer_write(&channel->outbound, bufferlist, 3); + ret = hv_ringbuffer_write(&channel->outbound, bufferlist, 3); /* TODO: We should determine if this is optional */ if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound)) @@ -848,7 +848,7 @@ int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel, sg_set_buf(&bufferlist[2], &aligned_data, packetlen_aligned - packetlen); - ret = ringbuffer_write(&channel->outbound, bufferlist, 3); + ret = hv_ringbuffer_write(&channel->outbound, bufferlist, 3); /* TODO: We should determine if this is optional */ if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound)) diff --git a/trunk/drivers/staging/hv/ring_buffer.c b/trunk/drivers/staging/hv/ring_buffer.c index 9bab40c1682d..483678c83eba 100644 --- a/trunk/drivers/staging/hv/ring_buffer.c +++ b/trunk/drivers/staging/hv/ring_buffer.c @@ -341,13 +341,13 @@ void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info) /*++ Name: - ringbuffer_write() + hv_ringbuffer_write() Description: Write to the ring buffer --*/ -int ringbuffer_write(struct hv_ring_buffer_info *outring_info, +int hv_ringbuffer_write(struct hv_ring_buffer_info *outring_info, struct scatterlist *sglist, u32 sgcount) { int i = 0; diff --git a/trunk/drivers/staging/hv/ring_buffer.h b/trunk/drivers/staging/hv/ring_buffer.h index 66d9a2d5f9c1..5c172889d116 100644 --- a/trunk/drivers/staging/hv/ring_buffer.h +++ b/trunk/drivers/staging/hv/ring_buffer.h @@ -81,7 +81,7 @@ int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info, void *buffer, void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info); -int ringbuffer_write(struct hv_ring_buffer_info *ring_info, +int hv_ringbuffer_write(struct hv_ring_buffer_info *ring_info, struct scatterlist *sglist, u32 sgcount);