summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAchiad Shochat <achiad@mellanox.com>2015-11-03 07:07:22 +0100
committerDavid S. Miller <davem@davemloft.net>2015-11-03 16:41:50 +0100
commitfe9f4fe58d17e09b210061ed089dba6e81564652 (patch)
tree87aeed4b767f3dc1844031d9901de39bc5da1629 /drivers/net
parentnet/mlx5e: Don't allow more than max supported channels (diff)
downloadlinux-fe9f4fe58d17e09b210061ed089dba6e81564652.tar.xz
linux-fe9f4fe58d17e09b210061ed089dba6e81564652.zip
net/mlx5e: Return error in case mlx5e_set_features() fails
In case mlx5e_set_features() fails, return the failure status rather than 0. Signed-off-by: Achiad Shochat <achiad@mellanox.com> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/en_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index febf71185964..28eaed572ec4 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -1843,7 +1843,7 @@ static int mlx5e_set_features(struct net_device *netdev,
mlx5e_disable_vlan_filter(priv);
}
- return 0;
+ return err;
}
static int mlx5e_change_mtu(struct net_device *netdev, int new_mtu)