aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Vecera <ivecera@redhat.com>2014-09-08 18:46:53 +0200
committerBen Hutchings <ben@decadent.org.uk>2018-06-01 00:30:26 +0100
commitf43a81763f525db5509177e36e04a6927a80c14e (patch)
tree828acb6c15893b15f583a772ab4bf0b67bbc4101
parentALSA: pcm: potential uninitialized return values (diff)
downloadlinux-stable-f43a81763f525db5509177e36e04a6927a80c14e.tar.xz
linux-stable-f43a81763f525db5509177e36e04a6927a80c14e.zip
net/mlx4_en: do not ignore autoneg in mlx4_en_set_pauseparam()
commit 278d436a476f69fc95d5c82bf61b6c2d02f4d44e upstream. The driver does not support pause autonegotiation so it should return -EINVAL when the function is called with non-zero autoneg. Cc: Amir Vadai <amirv@mellanox.com> Signed-off-by: Ivan Vecera <ivecera@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/en_ethtool.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index 26d080a87cd8..d288d8715276 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -364,6 +364,9 @@ static int mlx4_en_set_pauseparam(struct net_device *dev,
struct mlx4_en_dev *mdev = priv->mdev;
int err;
+ if (pause->autoneg)
+ return -EINVAL;
+
priv->prof->tx_pause = pause->tx_pause != 0;
priv->prof->rx_pause = pause->rx_pause != 0;
err = mlx4_SET_PORT_general(mdev->dev, priv->port,