diff options
-rw-r--r-- | drivers/net/igb/e1000_82575.c | 4 | ||||
-rw-r--r-- | drivers/net/igb/e1000_hw.h | 6 | ||||
-rw-r--r-- | drivers/net/igb/igb_main.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index bc183f5487cb..50f6e9649845 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c | |||
@@ -134,6 +134,8 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) | |||
134 | case E1000_DEV_ID_82580_COPPER_DUAL: | 134 | case E1000_DEV_ID_82580_COPPER_DUAL: |
135 | case E1000_DEV_ID_DH89XXCC_SGMII: | 135 | case E1000_DEV_ID_DH89XXCC_SGMII: |
136 | case E1000_DEV_ID_DH89XXCC_SERDES: | 136 | case E1000_DEV_ID_DH89XXCC_SERDES: |
137 | case E1000_DEV_ID_DH89XXCC_BACKPLANE: | ||
138 | case E1000_DEV_ID_DH89XXCC_SFP: | ||
137 | mac->type = e1000_82580; | 139 | mac->type = e1000_82580; |
138 | break; | 140 | break; |
139 | case E1000_DEV_ID_I350_COPPER: | 141 | case E1000_DEV_ID_I350_COPPER: |
@@ -1578,7 +1580,7 @@ static s32 igb_reset_mdicnfg_82580(struct e1000_hw *hw) | |||
1578 | { | 1580 | { |
1579 | s32 ret_val = 0; | 1581 | s32 ret_val = 0; |
1580 | u32 mdicnfg; | 1582 | u32 mdicnfg; |
1581 | u16 nvm_data; | 1583 | u16 nvm_data = 0; |
1582 | 1584 | ||
1583 | if (hw->mac.type != e1000_82580) | 1585 | if (hw->mac.type != e1000_82580) |
1584 | goto out; | 1586 | goto out; |
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h index c0b017f8d782..e2638afb8cdc 100644 --- a/drivers/net/igb/e1000_hw.h +++ b/drivers/net/igb/e1000_hw.h | |||
@@ -54,8 +54,10 @@ struct e1000_hw; | |||
54 | #define E1000_DEV_ID_82580_SERDES 0x1510 | 54 | #define E1000_DEV_ID_82580_SERDES 0x1510 |
55 | #define E1000_DEV_ID_82580_SGMII 0x1511 | 55 | #define E1000_DEV_ID_82580_SGMII 0x1511 |
56 | #define E1000_DEV_ID_82580_COPPER_DUAL 0x1516 | 56 | #define E1000_DEV_ID_82580_COPPER_DUAL 0x1516 |
57 | #define E1000_DEV_ID_DH89XXCC_SGMII 0x0436 | 57 | #define E1000_DEV_ID_DH89XXCC_SGMII 0x0438 |
58 | #define E1000_DEV_ID_DH89XXCC_SERDES 0x0438 | 58 | #define E1000_DEV_ID_DH89XXCC_SERDES 0x043A |
59 | #define E1000_DEV_ID_DH89XXCC_BACKPLANE 0x043C | ||
60 | #define E1000_DEV_ID_DH89XXCC_SFP 0x0440 | ||
59 | #define E1000_DEV_ID_I350_COPPER 0x1521 | 61 | #define E1000_DEV_ID_I350_COPPER 0x1521 |
60 | #define E1000_DEV_ID_I350_FIBER 0x1522 | 62 | #define E1000_DEV_ID_I350_FIBER 0x1522 |
61 | #define E1000_DEV_ID_I350_SERDES 0x1523 | 63 | #define E1000_DEV_ID_I350_SERDES 0x1523 |
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index c9aac7f15cd2..a364ae69ab37 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -73,6 +73,8 @@ static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = { | |||
73 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER_DUAL), board_82575 }, | 73 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER_DUAL), board_82575 }, |
74 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SGMII), board_82575 }, | 74 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SGMII), board_82575 }, |
75 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SERDES), board_82575 }, | 75 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SERDES), board_82575 }, |
76 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_BACKPLANE), board_82575 }, | ||
77 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SFP), board_82575 }, | ||
76 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 }, | 78 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 }, |
77 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS), board_82575 }, | 79 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS), board_82575 }, |
78 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS_SERDES), board_82575 }, | 80 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS_SERDES), board_82575 }, |