diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/hv/ring_buffer.c | 6 | ||||
-rw-r--r-- | drivers/staging/hv/ring_buffer.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c index f4efe7feee9..17bc7626f70 100644 --- a/drivers/staging/hv/ring_buffer.c +++ b/drivers/staging/hv/ring_buffer.c | |||
@@ -302,16 +302,16 @@ Description: | |||
302 | --*/ | 302 | --*/ |
303 | int RingBufferInit(struct hv_ring_buffer_info *RingInfo, void *Buffer, u32 BufferLen) | 303 | int RingBufferInit(struct hv_ring_buffer_info *RingInfo, void *Buffer, u32 BufferLen) |
304 | { | 304 | { |
305 | if (sizeof(RING_BUFFER) != PAGE_SIZE) | 305 | if (sizeof(struct hv_ring_buffer) != PAGE_SIZE) |
306 | return -EINVAL; | 306 | return -EINVAL; |
307 | 307 | ||
308 | memset(RingInfo, 0, sizeof(struct hv_ring_buffer_info)); | 308 | memset(RingInfo, 0, sizeof(struct hv_ring_buffer_info)); |
309 | 309 | ||
310 | RingInfo->RingBuffer = (RING_BUFFER *)Buffer; | 310 | RingInfo->RingBuffer = (struct hv_ring_buffer *)Buffer; |
311 | RingInfo->RingBuffer->ReadIndex = RingInfo->RingBuffer->WriteIndex = 0; | 311 | RingInfo->RingBuffer->ReadIndex = RingInfo->RingBuffer->WriteIndex = 0; |
312 | 312 | ||
313 | RingInfo->RingSize = BufferLen; | 313 | RingInfo->RingSize = BufferLen; |
314 | RingInfo->RingDataSize = BufferLen - sizeof(RING_BUFFER); | 314 | RingInfo->RingDataSize = BufferLen - sizeof(struct hv_ring_buffer); |
315 | 315 | ||
316 | spin_lock_init(&RingInfo->ring_lock); | 316 | spin_lock_init(&RingInfo->ring_lock); |
317 | 317 | ||
diff --git a/drivers/staging/hv/ring_buffer.h b/drivers/staging/hv/ring_buffer.h index 2d941f3eab0..a7f1717c6a5 100644 --- a/drivers/staging/hv/ring_buffer.h +++ b/drivers/staging/hv/ring_buffer.h | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | #include <linux/scatterlist.h> | 28 | #include <linux/scatterlist.h> |
29 | 29 | ||
30 | typedef struct _RING_BUFFER { | 30 | struct hv_ring_buffer { |
31 | /* Offset in bytes from the start of ring data below */ | 31 | /* Offset in bytes from the start of ring data below */ |
32 | volatile u32 WriteIndex; | 32 | volatile u32 WriteIndex; |
33 | 33 | ||
@@ -51,10 +51,10 @@ typedef struct _RING_BUFFER { | |||
51 | * !!! DO NOT place any fields below this !!! | 51 | * !!! DO NOT place any fields below this !!! |
52 | */ | 52 | */ |
53 | u8 Buffer[0]; | 53 | u8 Buffer[0]; |
54 | } __attribute__((packed)) RING_BUFFER; | 54 | } __attribute__((packed)); |
55 | 55 | ||
56 | struct hv_ring_buffer_info { | 56 | struct hv_ring_buffer_info { |
57 | RING_BUFFER *RingBuffer; | 57 | struct hv_ring_buffer *RingBuffer; |
58 | u32 RingSize; /* Include the shared header */ | 58 | u32 RingSize; /* Include the shared header */ |
59 | spinlock_t ring_lock; | 59 | spinlock_t ring_lock; |
60 | 60 | ||