aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/et131x/et1310_rx.h
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-01-18 15:33:56 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-03 16:42:50 -0800
commit8a66278cf91c9b0bfedd70865954d5fccba02237 (patch)
tree36f30347a1b1bf46228912ee1e20d91b1ae41a2d /drivers/staging/et131x/et1310_rx.h
parentStaging: et131x: Fix rx_status typing (diff)
downloadlinux-dev-8a66278cf91c9b0bfedd70865954d5fccba02237.tar.xz
linux-dev-8a66278cf91c9b0bfedd70865954d5fccba02237.zip
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.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/et131x/et1310_rx.h b/drivers/staging/et131x/et1310_rx.h
index b84d811e2912..a8915e6e59f0 100644
--- a/drivers/staging/et131x/et1310_rx.h
+++ b/drivers/staging/et131x/et1310_rx.h
@@ -230,13 +230,13 @@ struct rx_status_block {
/*
* Structure for look-up table holding free buffer ring pointers
*/
-typedef struct _FbrLookupTable {
- void *Va[MAX_DESC_PER_RING_RX];
- void *Buffer1[MAX_DESC_PER_RING_RX];
- void *Buffer2[MAX_DESC_PER_RING_RX];
- u32 PAHigh[MAX_DESC_PER_RING_RX];
- u32 PALow[MAX_DESC_PER_RING_RX];
-} FBRLOOKUPTABLE, *PFBRLOOKUPTABLE;
+struct fbr_lookup {
+ void *virt[MAX_DESC_PER_RING_RX];
+ void *buffer1[MAX_DESC_PER_RING_RX];
+ void *buffer2[MAX_DESC_PER_RING_RX];
+ u32 bus_high[MAX_DESC_PER_RING_RX];
+ u32 bus_low[MAX_DESC_PER_RING_RX];
+};
/*
* RX_RING_t is sructure representing the adaptor's local reference(s) to the
@@ -260,7 +260,7 @@ typedef struct _rx_ring_t {
dma_addr_t Fbr1MemPa[MAX_DESC_PER_RING_RX / FBR_CHUNKS];
uint64_t Fbr1Realpa;
uint64_t Fbr1offset;
- FBRLOOKUPTABLE *Fbr[2];
+ struct fbr_lookup *fbr[2]; /* One per ring */
u32 local_Fbr1_full;
u32 Fbr1NumEntries;
u32 Fbr1BufferSize;