git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
mellanox
/
mlx5
/
core
/
en_ethtool.c
diff --git
a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index de8250820b06879b16d52c05034e0056114bad1e..0279bb7246e178079b93455ecd23e8e27397528b 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@
-432,7
+432,7
@@
int mlx5e_ethtool_set_channels(struct mlx5e_priv *priv,
if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) {
*cur_params = new_channels.params;
- mlx5e_num_channels_changed(priv);
+
err =
mlx5e_num_channels_changed(priv);
goto out;
}