hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i40e: Fix order of checks when enabling/disabling autoneg in ethtool 

We were previously checking if autoneg was allowed to change before
checking if autoneg was changing. We need to do this in the other order
or else we will erroneously return EINVAL when autoneg is not changing.

Change-ID: Iff9f7d1c9bddc1ad1e5d227d4f42754f90155410
Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Catherine Sullivan 2015-09-28 14:16:58 -04:00 committed by Jeff Kirsher
parent a03dc36854
commit 3ce12ee9d8
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/ethernet/intel/i40e/i40e_ethtool.c
View File

@ -661,28 +661,31 @@ static int i40e_set_settings(struct net_device *netdev,
/* Check autoneg */ /* Check autoneg */
if (autoneg == AUTONEG_ENABLE) { if (autoneg == AUTONEG_ENABLE) {
/* If autoneg was not already enabled */
if (!(hw->phy.link_info.an_info & I40E_AQ_AN_COMPLETED)) {
/* If autoneg is not supported, return error */ /* If autoneg is not supported, return error */
if (!(safe_ecmd.supported & SUPPORTED_Autoneg)) { if (!(safe_ecmd.supported & SUPPORTED_Autoneg)) {
netdev_info(netdev, "Autoneg not supported on this phy\n"); netdev_info(netdev, "Autoneg not supported on this phy\n");
return -EINVAL; return -EINVAL;
} }
/* If autoneg was not already enabled */ /* Autoneg is allowed to change */
if (!(hw->phy.link_info.an_info & I40E_AQ_AN_COMPLETED)) {
config.abilities = abilities.abilities | config.abilities = abilities.abilities |
I40E_AQ_PHY_ENABLE_AN; I40E_AQ_PHY_ENABLE_AN;
change = true; change = true;
} }
} else { } else {
/* If autoneg is supported 10GBASE_T is the only phy that /* If autoneg is currently enabled */
* can disable it, so otherwise return error if (hw->phy.link_info.an_info & I40E_AQ_AN_COMPLETED) {
/* If autoneg is supported 10GBASE_T is the only PHY
* that can disable it, so otherwise return error
*/ */
if (safe_ecmd.supported & SUPPORTED_Autoneg && if (safe_ecmd.supported & SUPPORTED_Autoneg &&
hw->phy.link_info.phy_type != I40E_PHY_TYPE_10GBASE_T) { hw->phy.link_info.phy_type !=
I40E_PHY_TYPE_10GBASE_T) {
netdev_info(netdev, "Autoneg cannot be disabled on this phy\n"); netdev_info(netdev, "Autoneg cannot be disabled on this phy\n");
return -EINVAL; return -EINVAL;
} }
/* If autoneg is currently enabled */ /* Autoneg is allowed to change */
if (hw->phy.link_info.an_info & I40E_AQ_AN_COMPLETED) {
config.abilities = abilities.abilities & config.abilities = abilities.abilities &
~I40E_AQ_PHY_ENABLE_AN; ~I40E_AQ_PHY_ENABLE_AN;
change = true; change = true;