equal
deleted
inserted
replaced
67 #include <linux/reboot.h> |
67 #include <linux/reboot.h> |
68 #include <net/checksum.h> |
68 #include <net/checksum.h> |
69 #include <linux/mii.h> |
69 #include <linux/mii.h> |
70 #include <linux/ethtool.h> |
70 #include <linux/ethtool.h> |
71 #include <linux/if_vlan.h> |
71 #include <linux/if_vlan.h> |
|
72 #include "../ecdev.h" |
72 |
73 |
73 #define BAR_0 0 |
74 #define BAR_0 0 |
74 #define BAR_1 1 |
75 #define BAR_1 1 |
75 #define BAR_5 5 |
76 #define BAR_5 5 |
76 |
77 |
80 struct e1000_adapter; |
81 struct e1000_adapter; |
81 |
82 |
82 #include "e1000_hw-2.6.22-ethercat.h" |
83 #include "e1000_hw-2.6.22-ethercat.h" |
83 |
84 |
84 #ifdef DBG |
85 #ifdef DBG |
85 #define E1000_DBG(args...) printk(KERN_DEBUG "e1000: " args) |
86 #define E1000_DBG(args...) printk(KERN_DEBUG "ec_e1000: " args) |
86 #else |
87 #else |
87 #define E1000_DBG(args...) |
88 #define E1000_DBG(args...) |
88 #endif |
89 #endif |
89 |
90 |
90 #define E1000_ERR(args...) printk(KERN_ERR "e1000: " args) |
91 #define E1000_ERR(args...) printk(KERN_ERR "ec_e1000: " args) |
91 |
92 |
92 #define PFX "e1000: " |
93 #define PFX "ec_e1000: " |
93 #define DPRINTK(nlevel, klevel, fmt, args...) \ |
94 #define DPRINTK(nlevel, klevel, fmt, args...) \ |
94 (void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \ |
95 (void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \ |
95 printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \ |
96 printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \ |
96 __FUNCTION__ , ## args)) |
97 __FUNCTION__ , ## args)) |
97 |
98 |
340 boolean_t tso_force; |
341 boolean_t tso_force; |
341 boolean_t smart_power_down; /* phy smart power down */ |
342 boolean_t smart_power_down; /* phy smart power down */ |
342 boolean_t quad_port_a; |
343 boolean_t quad_port_a; |
343 unsigned long flags; |
344 unsigned long flags; |
344 uint32_t eeprom_wol; |
345 uint32_t eeprom_wol; |
|
346 |
|
347 ec_device_t *ecdev; |
|
348 unsigned long ec_watchdog_jiffies; |
345 }; |
349 }; |
346 |
350 |
347 enum e1000_state_t { |
351 enum e1000_state_t { |
348 __E1000_TESTING, |
352 __E1000_TESTING, |
349 __E1000_RESETTING, |
353 __E1000_RESETTING, |