git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
net/mlx4_en: do not ignore autoneg in mlx4_en_set_pauseparam()
[pandora-kernel.git]
/
drivers
/
net
/
ethernet
/
mellanox
/
mlx4
/
en_ethtool.c
diff --git
a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index
26d080a
..
d288d87
100644
(file)
--- 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,