diff options
| author | Alan Cox | 2009-08-27 12:00:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-09-15 21:02:27 +0200 |
| commit | 9fa81099210076a0269d1ef774d2e1f3c04de6e0 (patch) | |
| tree | 8249ba8308c6c5af2c2f4af9d37a5ef6e8248345 /drivers/staging/et131x/et131x_adapter.h | |
| parent | Staging: et131x: fold the diet config into the other code (diff) | |
| download | kernel-qcow2-linux-9fa81099210076a0269d1ef774d2e1f3c04de6e0.tar.gz kernel-qcow2-linux-9fa81099210076a0269d1ef774d2e1f3c04de6e0.tar.xz kernel-qcow2-linux-9fa81099210076a0269d1ef774d2e1f3c04de6e0.zip | |
Staging: et131x: de-hungarianise a bit
bOverrideAddress is write only so kill it rather than fix it
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et131x_adapter.h')
| -rw-r--r-- | drivers/staging/et131x/et131x_adapter.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h index 63d7c8afada8..3ac2343d4288 100644 --- a/drivers/staging/et131x/et131x_adapter.h +++ b/drivers/staging/et131x/et131x_adapter.h @@ -133,8 +133,8 @@ typedef struct _MP_RFD { struct list_head list_node; struct sk_buff *Packet; u32 PacketSize; /* total size of receive frame */ - u16 iBufferIndex; - u8 iRingIndex; + u16 bufferindex; + u8 ringindex; } MP_RFD, *PMP_RFD; /* Enum for Flow Control */ @@ -214,8 +214,7 @@ struct et131x_adapter { /* Configuration */ u8 PermanentAddress[ETH_ALEN]; u8 CurrentAddress[ETH_ALEN]; - bool bOverrideAddress; - bool bEepromPresent; + bool has_eeprom; u8 eepromData[2]; /* Spinlocks */ @@ -234,11 +233,8 @@ struct et131x_adapter { /* Packet Filter and look ahead size */ u32 PacketFilter; - u32 ulLookAhead; - u32 uiLinkSpeed; - u32 uiDuplexMode; - u32 uiAutoNegStatus; - u8 ucLinkStatus; + u32 linkspeed; + u32 duplex_mode; /* multicast list */ u32 MCAddressCount; @@ -275,11 +271,7 @@ struct et131x_adapter { u8 DriverNoPhyAccess; /* Minimize init-time */ - bool bQueryPending; - bool bSetPending; - bool bResetPending; struct timer_list ErrorTimer; - bool bLinkTimerActive; MP_POWER_MGMT PoMgmt; INTERRUPT_t CachedMaskValue; |