diff options
author | Alan Cox <alan@linux.intel.com> | 2010-01-18 10:33:56 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 19:42:50 -0500 |
commit | 8a66278cf91c9b0bfedd70865954d5fccba02237 (patch) | |
tree | 36f30347a1b1bf46228912ee1e20d91b1ae41a2d /drivers/staging/et131x/et1310_rx.h | |
parent | 07563ac691c284a5b9402556a270b8cc14164ff8 (diff) |
Staging: et131x: Clean up the fbr lookup table
All the subtypes are sane so just turn it into something struct and linux
like
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et1310_rx.h')
-rw-r--r-- | drivers/staging/et131x/et1310_rx.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/et131x/et1310_rx.h b/drivers/staging/et131x/et1310_rx.h index b84d811e291..a8915e6e59f 100644 --- a/drivers/staging/et131x/et1310_rx.h +++ b/drivers/staging/et131x/et1310_rx.h | |||
@@ -230,13 +230,13 @@ struct rx_status_block { | |||
230 | /* | 230 | /* |
231 | * Structure for look-up table holding free buffer ring pointers | 231 | * Structure for look-up table holding free buffer ring pointers |
232 | */ | 232 | */ |
233 | typedef struct _FbrLookupTable { | 233 | struct fbr_lookup { |
234 | void *Va[MAX_DESC_PER_RING_RX]; | 234 | void *virt[MAX_DESC_PER_RING_RX]; |
235 | void *Buffer1[MAX_DESC_PER_RING_RX]; | 235 | void *buffer1[MAX_DESC_PER_RING_RX]; |
236 | void *Buffer2[MAX_DESC_PER_RING_RX]; | 236 | void *buffer2[MAX_DESC_PER_RING_RX]; |
237 | u32 PAHigh[MAX_DESC_PER_RING_RX]; | 237 | u32 bus_high[MAX_DESC_PER_RING_RX]; |
238 | u32 PALow[MAX_DESC_PER_RING_RX]; | 238 | u32 bus_low[MAX_DESC_PER_RING_RX]; |
239 | } FBRLOOKUPTABLE, *PFBRLOOKUPTABLE; | 239 | }; |
240 | 240 | ||
241 | /* | 241 | /* |
242 | * RX_RING_t is sructure representing the adaptor's local reference(s) to the | 242 | * RX_RING_t is sructure representing the adaptor's local reference(s) to the |
@@ -260,7 +260,7 @@ typedef struct _rx_ring_t { | |||
260 | dma_addr_t Fbr1MemPa[MAX_DESC_PER_RING_RX / FBR_CHUNKS]; | 260 | dma_addr_t Fbr1MemPa[MAX_DESC_PER_RING_RX / FBR_CHUNKS]; |
261 | uint64_t Fbr1Realpa; | 261 | uint64_t Fbr1Realpa; |
262 | uint64_t Fbr1offset; | 262 | uint64_t Fbr1offset; |
263 | FBRLOOKUPTABLE *Fbr[2]; | 263 | struct fbr_lookup *fbr[2]; /* One per ring */ |
264 | u32 local_Fbr1_full; | 264 | u32 local_Fbr1_full; |
265 | u32 Fbr1NumEntries; | 265 | u32 Fbr1NumEntries; |
266 | u32 Fbr1BufferSize; | 266 | u32 Fbr1BufferSize; |