diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-03-30 21:14:18 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-03-30 21:14:18 -0700 |
commit | 5710faba8a2a15349c9001bd4b2cd958e56c90fa (patch) | |
tree | 80694ac211cac1b2347c3c905b38d86139dc51c1 /drivers/net/ethernet/intel/ice/ice_ethtool.c | |
parent | 5600f6986628dde8881734090588474f54a540a8 (diff) | |
parent | a949087c2285c8de4f0f204cab2d4eece9d929a2 (diff) |
Merge branch 'next' into for-linus
Prepare input updates for 5.18 merge window.
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_ethtool.c')
-rw-r--r-- | drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c index e2e3ef7fba7f..a5dc9824e255 100644 --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c @@ -2298,7 +2298,7 @@ ice_set_link_ksettings(struct net_device *netdev, if (err) goto done; - curr_link_speed = pi->phy.link_info.link_speed; + curr_link_speed = pi->phy.curr_user_speed_req; adv_link_speed = ice_ksettings_find_adv_link_speed(ks); /* If speed didn't get set, set it to what it currently is. |