Staging: et131x: fbr_desc is now only sane types

[safe/jmp/linux-2.6] / drivers / staging / et131x / et1310_rx.h

diff --git a/drivers/staging/et131x/et1310_rx.h b/drivers/staging/et131x/et1310_rx.h
index b71c432..afa670e 100644 (file)
--- a/drivers/staging/et131x/et1310_rx.h
+++ b/drivers/staging/et131x/et1310_rx.h
@@ -91,24 +91,12 @@
 #define ALCATEL_BROADCAST_PKT  0x02000000
 
 /* typedefs for Free Buffer Descriptors */
-typedef union _FBR_WORD2_t {
-       u32 value;
-       struct {
-#ifdef _BIT_FIELDS_HTOL
-               u32 reserved:22;        /* bits 10-31 */
-               u32 bi:10;              /* bits 0-9(Buffer Index) */
-#else
-               u32 bi:10;              /* bits 0-9(Buffer Index) */
-               u32 reserved:22;        /* bit 10-31 */
-#endif
-       } bits;
-} FBR_WORD2_t, *PFBR_WORD2_t;
-
-typedef struct _FBR_DESC_t {
+struct fbr_desc
+{
        u32 addr_lo;
        u32 addr_hi;
-       FBR_WORD2_t word2;
-} FBR_DESC_t, *PFBR_DESC_t;
+       u32 word2;              /* Bits 10-31 reserved, 0-9 descriptor */
+};
 
 /* Typedefs for Packet Status Ring Descriptors */
 typedef union _PKT_STAT_DESC_WORD0_t {
@@ -272,15 +260,6 @@ typedef enum {
 } eRX_INTERRUPT_STATE_t, *PeRX_INTERRUPT_STATE_t;
 
 /*
- * Structure to hold the skb's in a list
- */
-typedef struct rx_skb_list_elem {
-       struct list_head skb_list_elem;
-       dma_addr_t dma_addr;
-       struct sk_buff *skb;
-} RX_SKB_LIST_ELEM, *PRX_SKB_LIST_ELEM;
-
-/*
  * RX_RING_t is sructure representing the adaptor's local reference(s) to the
  * rings
  */
@@ -309,7 +288,7 @@ typedef struct _rx_ring_t {
 
        void *pPSRingVa;
        dma_addr_t pPSRingPa;
-       RXDMA_PSR_FULL_OFFSET_t local_psr_full;
+       u32 local_psr_full;
        u32 PsrNumEntries;
 
        void *pRxStatusVa;