aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
diff options
context:
space:
mode:
authorjoshua.a.hay@intel.com <joshua.a.hay@intel.com>2012-09-20 20:08:21 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-10-03 11:38:30 -0400
commitdf376f0de167754da9b3ece4afdb5bb8bf3fbf3e (patch)
tree462da44cf94fadb6fe0fe5b8dc859e41e79d498d /drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
parent4a97df0bfaa8c0c1cd057cb8f1030a71cb4d8832 (diff)
ixgbe: add support for X540-AT1
This patch adds device support for Ethernet Controller X540-AT1. Signed-off-by: Josh Hay <joshua.a.hay@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_main.c')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index c407b2f0f0f9..fa3d552e1f4a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -114,6 +114,7 @@ static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = {
114 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_LS), board_82599 }, 114 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_LS), board_82599 },
115 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599EN_SFP), board_82599 }, 115 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599EN_SFP), board_82599 },
116 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP), board_82599 }, 116 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP), board_82599 },
117 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T1), board_X540 },
117 /* required last entry */ 118 /* required last entry */
118 {0, } 119 {0, }
119}; 120};
@@ -7054,6 +7055,7 @@ int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id,
7054 is_wol_supported = 1; 7055 is_wol_supported = 1;
7055 break; 7056 break;
7056 case IXGBE_DEV_ID_X540T: 7057 case IXGBE_DEV_ID_X540T:
7058 case IXGBE_DEV_ID_X540T1:
7057 /* check eeprom to see if enabled wol */ 7059 /* check eeprom to see if enabled wol */
7058 if ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0_1) || 7060 if ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0_1) ||
7059 ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0) && 7061 ((wol_cap == IXGBE_DEVICE_CAPS_WOL_PORT0) &&