UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Don Skidmore 2015-06-09 17:52:41 -07:00 committed by Jeff Kirsher
parent 7e49d6165e
commit d5ec98a019
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
View File

@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
* *
* Intel 10 Gigabit PCI Express Linux driver * 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 * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * 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, \ .read_reg = &ixgbe_read_phy_reg_generic, \
.write_reg = &ixgbe_write_phy_reg_generic, \ .write_reg = &ixgbe_write_phy_reg_generic, \
.setup_link = &ixgbe_setup_phy_link_generic, \ .setup_link = &ixgbe_setup_phy_link_generic, \
.set_phy_power = &ixgbe_set_copper_phy_power, \
.check_overtemp = &ixgbe_tn_check_overtemp, \ .check_overtemp = &ixgbe_tn_check_overtemp, \
.get_firmware_version = &ixgbe_get_phy_firmware_version_generic, .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, .identify = &ixgbe_identify_phy_generic,
.read_i2c_combined = &ixgbe_read_i2c_combined_generic, .read_i2c_combined = &ixgbe_read_i2c_combined_generic,
.write_i2c_combined = &ixgbe_write_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 = { static struct ixgbe_phy_operations phy_ops_X550EM_x = {