summaryrefslogtreecommitdiff
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorKamal Heib <kamalheib1@gmail.com>2020-09-02 15:43:04 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-17 13:45:23 +0200
commit0f9bbab73b5237cecafa9bc7041e5c3f6a15978e (patch)
tree72d02a322fe30c57698c4314aaf2f6b1685185fa /drivers/infiniband
parent0d211632108087b35007e3198b109dff4549264b (diff)
downloadlinux-0f9bbab73b5237cecafa9bc7041e5c3f6a15978e.tar.gz
linux-0f9bbab73b5237cecafa9bc7041e5c3f6a15978e.tar.bz2
linux-0f9bbab73b5237cecafa9bc7041e5c3f6a15978e.zip
RDMA/core: Fix reported speed and width
[ Upstream commit 28b0865714b315e318ac45c4fc9156f3d4649646 ] When the returned speed from __ethtool_get_link_ksettings() is SPEED_UNKNOWN this will lead to reporting a wrong speed and width for providers that uses ib_get_eth_speed(), fix that by defaulting the netdev_speed to SPEED_1000 in case the returned value from __ethtool_get_link_ksettings() is SPEED_UNKNOWN. Fixes: d41861942fc5 ("IB/core: Add generic function to extract IB speed from netdev") Link: https://lore.kernel.org/r/20200902124304.170912-1-kamalheib1@gmail.com Signed-off-by: Kamal Heib <kamalheib1@gmail.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/core/verbs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index e8432876cc86..e1ecd4682c09 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -1711,7 +1711,7 @@ int ib_get_eth_speed(struct ib_device *dev, u8 port_num, u8 *speed, u8 *width)
dev_put(netdev);
- if (!rc) {
+ if (!rc && lksettings.base.speed != (u32)SPEED_UNKNOWN) {
netdev_speed = lksettings.base.speed;
} else {
netdev_speed = SPEED_1000;