]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
i40e: Fix autoneg disabling for non-10GBaseT links
authorMateusz Palczewski <mateusz.palczewski@intel.com>
Wed, 10 Mar 2021 11:12:54 +0000 (11:12 +0000)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 13 Aug 2021 07:45:51 +0000 (09:45 +0200)
BugLink: https://bugs.launchpad.net/bugs/1938199
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/net/ethernet/intel/i40e/i40e_ethtool.c

index e4d0b7747e84d34c54b20928cf561b35570fbba1..2288a3855e5229d226b4ecef9dad13f392d0b139 100644 (file)
@@ -1259,8 +1259,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;