diff options
| author |   Don Skidmore <donald.c.skidmore@intel.com> | 2015-06-09 17:52:41 -0700 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-06-09 17:52:41 -0700 |
| commit | d5ec98a01909ed98638303e58193f82d5de088f1 (patch) | |
| tree | 0ca2eaf86ecdc5e54b4ffcd662ecc43dd6f24a65 | |
| parent | ixgbe: Set lan_id before using I2C (diff) | |
| download | linux-dev-d5ec98a01909ed98638303e58193f82d5de088f1.tar.xz linux-dev-d5ec98a01909ed98638303e58193f82d5de088f1.zip | |
ixgbe: fix X550 default set_phy_power method
Even though X550 may later clear this value for certain devices
set it initially to support copper.
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c index d65327ec7350..bb1439cf6c6c 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Intel 10 Gigabit PCI Express Linux driver - * Copyright(c) 1999 - 2014 Intel Corporation. + * Copyright(c) 1999 - 2015 Intel Corporation. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -1855,6 +1855,7 @@ static struct ixgbe_eeprom_operations eeprom_ops_X550EM_x = { .read_reg = &ixgbe_read_phy_reg_generic, \ .write_reg = &ixgbe_write_phy_reg_generic, \ .setup_link = &ixgbe_setup_phy_link_generic, \ + .set_phy_power = &ixgbe_set_copper_phy_power, \ .check_overtemp = &ixgbe_tn_check_overtemp, \ .get_firmware_version = &ixgbe_get_phy_firmware_version_generic, @@ -1864,7 +1865,6 @@ static struct ixgbe_phy_operations phy_ops_X550 = { .identify = &ixgbe_identify_phy_generic, .read_i2c_combined = &ixgbe_read_i2c_combined_generic, .write_i2c_combined = &ixgbe_write_i2c_combined_generic, - .set_phy_power = &ixgbe_set_copper_phy_power, }; static struct ixgbe_phy_operations phy_ops_X550EM_x = { |