aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ipg.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ipg.h')
-rw-r--r--drivers/net/ipg.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ipg.h b/drivers/net/ipg.h
index 7e3ccd103630..a328221d7abb 100644
--- a/drivers/net/ipg.h
+++ b/drivers/net/ipg.h
@@ -79,7 +79,7 @@ enum ipg_regs {
79 TX_STATUS = 0x60, 79 TX_STATUS = 0x60,
80 MAC_CTRL = 0x6c, 80 MAC_CTRL = 0x6c,
81 VLAN_TAG = 0x70, // Unused 81 VLAN_TAG = 0x70, // Unused
82 PHY_SET = 0x75, // JES20040127EEPROM 82 PHY_SET = 0x75,
83 PHY_CTRL = 0x76, 83 PHY_CTRL = 0x76,
84 STATION_ADDRESS_0 = 0x78, 84 STATION_ADDRESS_0 = 0x78,
85 STATION_ADDRESS_1 = 0x7a, 85 STATION_ADDRESS_1 = 0x7a,
@@ -312,7 +312,7 @@ enum ipg_regs {
312#define IPG_RM_RECEIVEMULTICASTHASH 0x10 312#define IPG_RM_RECEIVEMULTICASTHASH 0x10
313#define IPG_RM_RECEIVEIPMULTICAST 0x20 313#define IPG_RM_RECEIVEIPMULTICAST 0x20
314 314
315/* PhySet JES20040127EEPROM*/ 315/* PhySet */
316#define IPG_PS_MEM_LENB9B 0x01 316#define IPG_PS_MEM_LENB9B 0x01
317#define IPG_PS_MEM_LEN9 0x02 317#define IPG_PS_MEM_LEN9 0x02
318#define IPG_PS_NON_COMPDET 0x04 318#define IPG_PS_NON_COMPDET 0x04
@@ -369,8 +369,8 @@ enum ipg_regs {
369#define IPG_AC_RST_OUT 0x01000000 369#define IPG_AC_RST_OUT 0x01000000
370#define IPG_AC_INT_REQUEST 0x02000000 370#define IPG_AC_INT_REQUEST 0x02000000
371#define IPG_AC_RESET_BUSY 0x04000000 371#define IPG_AC_RESET_BUSY 0x04000000
372#define IPG_AC_LED_SPEED 0x08000000 //JES20040127EEPROM 372#define IPG_AC_LED_SPEED 0x08000000
373#define IPG_AC_LED_MODE_BIT_1 0x20000000 //JES20040127EEPROM 373#define IPG_AC_LED_MODE_BIT_1 0x20000000
374 374
375/* EepromCtrl */ 375/* EepromCtrl */
376#define IPG_EC_RSVD_MASK 0x83FF 376#define IPG_EC_RSVD_MASK 0x83FF
@@ -785,7 +785,6 @@ struct ipg_nic_private {
785 unsigned int tx_dirty; 785 unsigned int tx_dirty;
786 unsigned int rx_current; 786 unsigned int rx_current;
787 unsigned int rx_dirty; 787 unsigned int rx_dirty;
788// Add by Grace 2005/05/19
789#ifdef JUMBO_FRAME 788#ifdef JUMBO_FRAME
790 struct SJumbo Jumbo; 789 struct SJumbo Jumbo;
791#endif 790#endif
@@ -796,7 +795,6 @@ struct ipg_nic_private {
796 spinlock_t lock; 795 spinlock_t lock;
797 int tenmbpsmode; 796 int tenmbpsmode;
798 797
799 /*Jesse20040128EEPROM_VALUE */
800 u16 LED_Mode; 798 u16 LED_Mode;
801 u16 station_addr[3]; /* Station Address in EEPROM Reg 0x10..0x12 */ 799 u16 station_addr[3]; /* Station Address in EEPROM Reg 0x10..0x12 */
802 800