diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-29 17:02:17 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-29 17:02:17 -0400 |
| commit | 27a639a92d3289c4851105efcbc2f8b88969194f (patch) | |
| tree | 09ee327d3ed3e2c40d5dc3b0f6b283477282deec /drivers/net/skge.h | |
| parent | d395bf12d1ba61437e546eb642f0d7ea666123ff (diff) | |
| parent | bf4e70e54cf31dcca48d279c7f7e71328eebe749 (diff) | |
| download | kernel_samsung_smdk4412-27a639a92d3289c4851105efcbc2f8b88969194f.zip kernel_samsung_smdk4412-27a639a92d3289c4851105efcbc2f8b88969194f.tar.gz kernel_samsung_smdk4412-27a639a92d3289c4851105efcbc2f8b88969194f.tar.bz2 | |
Auto-update from upstream
Diffstat (limited to 'drivers/net/skge.h')
| -rw-r--r-- | drivers/net/skge.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/net/skge.h b/drivers/net/skge.h index b432f1b..f1680be 100644 --- a/drivers/net/skge.h +++ b/drivers/net/skge.h @@ -214,8 +214,6 @@ enum { /* B2_IRQM_HWE_MSK 32 bit IRQ Moderation HW Error Mask */ enum { - IS_ERR_MSK = 0x00003fff,/* All Error bits */ - IS_IRQ_TIST_OV = 1<<13, /* Time Stamp Timer Overflow (YUKON only) */ IS_IRQ_SENSOR = 1<<12, /* IRQ from Sensor (YUKON only) */ IS_IRQ_MST_ERR = 1<<11, /* IRQ master error detected */ @@ -230,6 +228,12 @@ enum { IS_M2_PAR_ERR = 1<<2, /* MAC 2 Parity Error */ IS_R1_PAR_ERR = 1<<1, /* Queue R1 Parity Error */ IS_R2_PAR_ERR = 1<<0, /* Queue R2 Parity Error */ + + IS_ERR_MSK = IS_IRQ_MST_ERR | IS_IRQ_STAT + | IS_NO_STAT_M1 | IS_NO_STAT_M2 + | IS_RAM_RD_PAR | IS_RAM_WR_PAR + | IS_M1_PAR_ERR | IS_M2_PAR_ERR + | IS_R1_PAR_ERR | IS_R2_PAR_ERR, }; /* B2_TST_CTRL1 8 bit Test Control Register 1 */ @@ -2456,24 +2460,17 @@ struct skge_hw { u8 chip_id; u8 chip_rev; - u8 phy_type; - u8 pmd_type; - u16 phy_addr; + u8 copper; u8 ports; u32 ram_size; u32 ram_offset; + u16 phy_addr; struct tasklet_struct ext_tasklet; spinlock_t phy_lock; }; - -static inline int iscopper(const struct skge_hw *hw) -{ - return (hw->pmd_type == 'T'); -} - enum { FLOW_MODE_NONE = 0, /* No Flow-Control */ FLOW_MODE_LOC_SEND = 1, /* Local station sends PAUSE */ |