diff options
Diffstat (limited to 'drivers/net/igb/e1000_hw.h')
-rw-r--r-- | drivers/net/igb/e1000_hw.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h index 82a533f5192a..cb8db78b1a05 100644 --- a/drivers/net/igb/e1000_hw.h +++ b/drivers/net/igb/e1000_hw.h | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
33 | #include <linux/io.h> | 33 | #include <linux/io.h> |
34 | #include <linux/netdevice.h> | ||
34 | 35 | ||
35 | #include "e1000_regs.h" | 36 | #include "e1000_regs.h" |
36 | #include "e1000_defines.h" | 37 | #include "e1000_defines.h" |
@@ -53,6 +54,10 @@ struct e1000_hw; | |||
53 | #define E1000_DEV_ID_82580_SERDES 0x1510 | 54 | #define E1000_DEV_ID_82580_SERDES 0x1510 |
54 | #define E1000_DEV_ID_82580_SGMII 0x1511 | 55 | #define E1000_DEV_ID_82580_SGMII 0x1511 |
55 | #define E1000_DEV_ID_82580_COPPER_DUAL 0x1516 | 56 | #define E1000_DEV_ID_82580_COPPER_DUAL 0x1516 |
57 | #define E1000_DEV_ID_I350_COPPER 0x1521 | ||
58 | #define E1000_DEV_ID_I350_FIBER 0x1522 | ||
59 | #define E1000_DEV_ID_I350_SERDES 0x1523 | ||
60 | #define E1000_DEV_ID_I350_SGMII 0x1524 | ||
56 | 61 | ||
57 | #define E1000_REVISION_2 2 | 62 | #define E1000_REVISION_2 2 |
58 | #define E1000_REVISION_4 4 | 63 | #define E1000_REVISION_4 4 |
@@ -72,6 +77,7 @@ enum e1000_mac_type { | |||
72 | e1000_82575, | 77 | e1000_82575, |
73 | e1000_82576, | 78 | e1000_82576, |
74 | e1000_82580, | 79 | e1000_82580, |
80 | e1000_i350, | ||
75 | e1000_num_macs /* List is 1-based, so subtract 1 for true count. */ | 81 | e1000_num_macs /* List is 1-based, so subtract 1 for true count. */ |
76 | }; | 82 | }; |
77 | 83 | ||
@@ -502,14 +508,11 @@ struct e1000_hw { | |||
502 | u8 revision_id; | 508 | u8 revision_id; |
503 | }; | 509 | }; |
504 | 510 | ||
505 | #ifdef DEBUG | 511 | extern struct net_device *igb_get_hw_dev(struct e1000_hw *hw); |
506 | extern char *igb_get_hw_dev_name(struct e1000_hw *hw); | ||
507 | #define hw_dbg(format, arg...) \ | 512 | #define hw_dbg(format, arg...) \ |
508 | printk(KERN_DEBUG "%s: " format, igb_get_hw_dev_name(hw), ##arg) | 513 | netdev_dbg(igb_get_hw_dev(hw), format, ##arg) |
509 | #else | 514 | |
510 | #define hw_dbg(format, arg...) | ||
511 | #endif | ||
512 | #endif | ||
513 | /* These functions must be implemented by drivers */ | 515 | /* These functions must be implemented by drivers */ |
514 | s32 igb_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value); | 516 | s32 igb_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value); |
515 | s32 igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value); | 517 | s32 igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value); |
518 | #endif /* _E1000_HW_H_ */ | ||