Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[pandora-kernel.git] / drivers / staging / et131x / et131x_adapter.h

diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h
index c852f86..408c50b 100644 (file)
--- a/drivers/staging/et131x/et131x_adapter.h
+++ b/drivers/staging/et131x/et131x_adapter.h
@@ -67,7 +67,7 @@
  * Do not change these values: if changed, then change also in respective
  * TXdma and Rxdma engines
  */
-#define NUM_DESC_PER_RING_TX         512       /* TX Do not change these values */
+#define NUM_DESC_PER_RING_TX         512    /* TX Do not change these values */
 #define NUM_TCB                      64
 
 /*
@@ -98,11 +98,7 @@ struct rfd {
 #define FLOW_NONE      3
 
 /* Struct to define some device statistics */
-typedef struct _ce_stats_t {
-       /* Link Input/Output stats */
-       uint64_t ipackets;      /* # of in packets */
-       uint64_t opackets;      /* # of out packets */
-
+struct ce_stats {
        /* MIB II variables
         *
         * NOTE: atomic_t types are only guaranteed to store 24-bits; if we
@@ -118,7 +114,7 @@ typedef struct _ce_stats_t {
        u32 norcvbuf;   /* # Rx packets discarded */
        u32 noxmtbuf;   /* # Tx packets discarded */
 
-       /* Transciever state informations. */
+       /* Transceiver state informations. */
        u8 xcvr_addr;
        u32 xcvr_id;
 
@@ -143,7 +139,7 @@ typedef struct _ce_stats_t {
 
        u32 SynchrounousIterations;
        u32 InterruptStatus;
-} CE_STATS_t, *PCE_STATS_t;
+};
 
 
 /* The private adapter structure */
@@ -154,7 +150,7 @@ struct et131x_adapter {
        struct work_struct task;
 
        /* Flags that indicate current state of the adapter */
-       u32 Flags;
+       u32 flags;
        u32 HwErrCount;
 
        /* Configuration  */
@@ -186,7 +182,7 @@ struct et131x_adapter {
        u8 MCList[NIC_MAX_MCAST_LIST][ETH_ALEN];
 
        /* Pointer to the device's PCI register space */
-       ADDRESS_MAP_t __iomem *regs;
+       struct address_map __iomem *regs;
 
        /* Registry parameters */
        u8 SpeedDuplex;         /* speed/duplex */
@@ -226,7 +222,7 @@ struct et131x_adapter {
        u32 CachedMaskValue;
 
        /* Xcvr status at last poll */
-       MI_BMSR_t Bmsr;
+       u16 bmsr;
 
        /* Tx Memory Variables */
        struct tx_ring tx_ring;
@@ -239,10 +235,9 @@ struct et131x_adapter {
        u8 ReplicaPhyLoopbkPF;  /* Replica Enable Pass/Fail */
 
        /* Stats */
-       CE_STATS_t Stats;
+       struct ce_stats stats;
 
        struct net_device_stats net_stats;
-       struct net_device_stats net_stats_prev;
 };
 
 #endif /* __ET131X_ADAPTER_H__ */