net/mlx5e: Return error in case mlx5e_set_features() fails
authorAchiad Shochat <achiad@mellanox.com>
Tue, 3 Nov 2015 06:07:22 +0000 (08:07 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Nov 2015 15:41:50 +0000 (10:41 -0500)
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>
drivers/net/ethernet/mellanox/mlx5/core/en_main.c

index febf711859648aab8acb355f1ea7a9a431ef35bf..28eaed572ec474d7a7a33d77c6cc8f445f4ecfab 100644 (file)
@@ -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)