diff options
author | Jacob Keller | 2012-06-08 08:59:09 +0200 |
---|---|---|
committer | Jeff Kirsher | 2012-06-20 10:37:04 +0200 |
commit | a49fda3eaa4fe70fdd14681060a7c6c6246dc927 (patch) | |
tree | 9505007af38abf12353443c95cfbe3b9c6df45ba /drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | |
parent | igb: Version bump (diff) | |
download | kernel-qcow2-linux-a49fda3eaa4fe70fdd14681060a7c6c6246dc927.tar.gz kernel-qcow2-linux-a49fda3eaa4fe70fdd14681060a7c6c6246dc927.tar.xz kernel-qcow2-linux-a49fda3eaa4fe70fdd14681060a7c6c6246dc927.zip |
ixgbe: add support for 1G SX modules
This patch adds support for 1G Fiber PHY modules (SFP+ modules). This support
comes along side support for 1G Copper PHY modules, but uses a different PHY
type (ixgbe_sfp_type_1g_sx_core).
Signed-off-by: Jacob Keller <jacob.e.keller@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_82599.c')
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c index dee64d2703f0..e7dddfd97cb9 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c @@ -241,7 +241,9 @@ static s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw, /* Determine 1G link capabilities off of SFP+ type */ if (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 || - hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1) { + hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 || + hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 || + hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1) { *speed = IXGBE_LINK_SPEED_1GB_FULL; *negotiation = true; goto out; |