From: Saeed Mahameed <saeedm@mellanox.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, Shay Agroskin <shayag@mellanox.com>,
Or Gerlitz <ogerlitz@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>
Subject: [net 2/4] net/mlx5e: Fix wrong error code return on FEC query failure
Date: Fri, 18 Jan 2019 16:25:21 -0800 [thread overview]
Message-ID: <20190119002523.16097-3-saeedm@mellanox.com> (raw)
In-Reply-To: <20190119002523.16097-1-saeedm@mellanox.com>
From: Shay Agroskin <shayag@mellanox.com>
Advertised and configured FEC query failure resulted in printing
wrong error code.
Fixes: 6cfa94605091 ("net/mlx5e: Ethtool driver callback for query/set FEC policy")
Signed-off-by: Shay Agroskin <shayag@mellanox.com>
Reported-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index c9df08133718..3bbccead2f63 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -844,9 +844,12 @@ int mlx5e_ethtool_get_link_ksettings(struct mlx5e_priv *priv,
ethtool_link_ksettings_add_link_mode(link_ksettings, supported,
Autoneg);
- if (get_fec_supported_advertised(mdev, link_ksettings))
+ err = get_fec_supported_advertised(mdev, link_ksettings);
+ if (err) {
netdev_dbg(priv->netdev, "%s: FEC caps query failed: %d\n",
__func__, err);
+ err = 0; /* don't fail caps query because of FEC error */
+ }
if (!an_disable_admin)
ethtool_link_ksettings_add_link_mode(link_ksettings,
--
2.20.1
next prev parent reply other threads:[~2019-01-19 0:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-19 0:25 [pull request][net 0/4] Mellanox, mlx5 fixes 2019-01-18 Saeed Mahameed
2019-01-19 0:25 ` [net 1/4] net/mlx5e: Force CHECKSUM_UNNECESSARY for short ethernet frames Saeed Mahameed
2019-01-22 21:30 ` Cong Wang
2019-01-25 18:22 ` Saeed Mahameed
2019-01-25 18:31 ` Eric Dumazet
2019-01-25 18:58 ` Saeed Mahameed
2019-01-19 0:25 ` Saeed Mahameed [this message]
2019-01-19 0:25 ` [net 3/4] net/mlx5e: Fix wrong (zero) TX drop counter indication for representor Saeed Mahameed
2019-01-19 0:25 ` [net 4/4] net/mlx5e: Fix cb_ident duplicate in indirect block register Saeed Mahameed
2019-01-19 2:21 ` [pull request][net 0/4] Mellanox, mlx5 fixes 2019-01-18 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190119002523.16097-3-saeedm@mellanox.com \
--to=saeedm@mellanox.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=shayag@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).