net/mlx5e: Return error in case mlx5e_set_features() fails

Achiad Shochat · davem330 · commit fe9f4fe58d17 · 2015-11-03T10:41:50.000-05:00
In case mlx5e_set_features() fails, return the failure status rather
than 0.

Signed-off-by: Achiad Shochat &lt;achiad@mellanox.com&gt;
Signed-off-by: Or Gerlitz &lt;ogerlitz@mellanox.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -1843,7 +1843,7 @@ static int mlx5e_set_features(struct net_device *netdev,`
`1843`	`1843`	`mlx5e_disable_vlan_filter(priv);`
`1844`	`1844`	`}`
`1845`	`1845`
`1846`		`- return 0;`
	`1846`	`+ return err;`
`1847`	`1847`	`}`
`1848`	`1848`
`1849`	`1849`	`static int mlx5e_change_mtu(struct net_device *netdev, int new_mtu)`