| From 0f985b9a3ec6e6e350dbc911d425f1a1c12a3087 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 10 Mar 2021 11:12:54 +0000 |
| Subject: i40e: Fix autoneg disabling for non-10GBaseT links |
| |
| From: Mateusz Palczewski <mateusz.palczewski@intel.com> |
| |
| [ Upstream commit 9262793e59f0423437166a879a73d056b1fe6f9a ] |
| |
| Disabling autonegotiation was allowed only for 10GBaseT PHY. |
| The condition was changed to check if link media type is BaseT. |
| |
| Fixes: 3ce12ee9d8f9 ("i40e: Fix order of checks when enabling/disabling autoneg in ethtool") |
| Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com> |
| Reviewed-by: Karen Sornek <karen.sornek@intel.com> |
| Signed-off-by: Dawid Lukwinski <dawid.lukwinski@intel.com> |
| Signed-off-by: Mateusz Palczewski <mateusz.palczewski@intel.com> |
| Tested-by: Tony Brelinski <tonyx.brelinski@intel.com> |
| Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c |
| index 5d48bc0c3f6c..874073f7f024 100644 |
| --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c |
| +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c |
| @@ -1262,8 +1262,7 @@ static int i40e_set_link_ksettings(struct net_device *netdev, |
| if (ethtool_link_ksettings_test_link_mode(&safe_ks, |
| supported, |
| Autoneg) && |
| - hw->phy.link_info.phy_type != |
| - I40E_PHY_TYPE_10GBASE_T) { |
| + hw->phy.media_type != I40E_MEDIA_TYPE_BASET) { |
| netdev_info(netdev, "Autoneg cannot be disabled on this phy\n"); |
| err = -EINVAL; |
| goto done; |
| -- |
| 2.30.2 |
| |
