From 818be53ba5baf95f470b9a72d5f489f2f7d98d47 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 10 Mar 2011 18:55:35 -0800 Subject: [PATCH] --- yaml --- r: 236379 b: refs/heads/master c: 26da4b510dab790905801e99c83230ea517d7eab h: refs/heads/master i: 236377: c81d8de8cbc5a1c59d6c74593b7f32780ecbecbd 236375: 5112bb98ce80807ea34bf014fe84eb41973bf564 v: v3 --- [refs] | 2 +- trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 898739c366bd..d722ffb7273e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06265442028254cce5a6f19dfa0bab11c88f06fe +refs/heads/master: 26da4b510dab790905801e99c83230ea517d7eab diff --git a/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.h index 19d8e706057d..e0c3926c0bcf 100644 --- a/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.h +++ b/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.h @@ -89,12 +89,12 @@ typedef PREPACK struct _AR6K_GMBOX_CTRL_REGISTERS { #define AR6K_MIN_TRANSFER_SIZE_PER_SCATTER 4*1024 /* buffers for ASYNC I/O */ -typedef struct AR6K_ASYNC_REG_IO_BUFFER { +struct ar6k_async_reg_io_buffer { HTC_PACKET HtcPacket; /* we use an HTC packet as a wrapper for our async register-based I/O */ u8 _Pad1[A_CACHE_LINE_PAD]; u8 Buffer[AR6K_REG_IO_BUFFER_SIZE]; /* cache-line safe with pads around */ u8 _Pad2[A_CACHE_LINE_PAD]; -} AR6K_ASYNC_REG_IO_BUFFER; +}; typedef struct _AR6K_GMBOX_INFO { void *pProtocolContext; @@ -119,7 +119,7 @@ typedef struct _AR6K_DEVICE { HIF_PENDING_EVENTS_FUNC GetPendingEventsFunc; void *HTCContext; HTC_PACKET_QUEUE RegisterIOList; - AR6K_ASYNC_REG_IO_BUFFER RegIOBuffers[AR6K_MAX_REG_IO_BUFFERS]; + struct ar6k_async_reg_io_buffer RegIOBuffers[AR6K_MAX_REG_IO_BUFFERS]; void (*TargetFailureCallback)(void *Context); int (*MessagePendingCallback)(void *Context, u32 LookAheads[],