net/mlx4: Clean the code to eliminate trivial build warnings
Remove code that triggers trivial build warnings. drivers/net/ethernet/mellanox/mlx4/cmd.c: In function ‘mlx4_set_vf_vlan’: drivers/net/ethernet/mellanox/mlx4/cmd.c:2256: warning: variable ‘vf_oper’ set but not used drivers/net/ethernet/mellanox/mlx4/mcg.c: In function ‘mlx4_map_sw_to_hw_steering_mode’: drivers/net/ethernet/mellanox/mlx4/mcg.c:648: warning: comparison of unsigned expression < 0 is always false drivers/net/ethernet/mellanox/mlx4/mcg.c: In function ‘mlx4_map_sw_to_hw_steering_id’: drivers/net/ethernet/mellanox/mlx4/mcg.c:685: warning: comparison of unsigned expression < 0 is always false drivers/net/ethernet/mellanox/mlx4/mcg.c: In function ‘mlx4_hw_rule_sz’: drivers/net/ethernet/mellanox/mlx4/mcg.c:712: warning: comparison of unsigned expression < 0 is always false drivers/net/ethernet/mellanox/mlx4/fw.c: In function ‘mlx4_opreq_action’: drivers/net/ethernet/mellanox/mlx4/fw.c:1732: warning: variable ‘type_m’ set but not used drivers/net/ethernet/mellanox/mlx4/srq.c:302: warning: no previous prototype for ‘mlx4_srq_lookup’ Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by: Amir Vadai <amirv@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
c1d607cc4a
Коммит
fe66bb2db5
|
@ -2253,7 +2253,6 @@ EXPORT_SYMBOL_GPL(mlx4_set_vf_mac);
|
|||
int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos)
|
||||
{
|
||||
struct mlx4_priv *priv = mlx4_priv(dev);
|
||||
struct mlx4_vport_oper_state *vf_oper;
|
||||
struct mlx4_vport_state *vf_admin;
|
||||
int slave;
|
||||
|
||||
|
@ -2269,7 +2268,6 @@ int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos)
|
|||
return -EINVAL;
|
||||
|
||||
vf_admin = &priv->mfunc.master.vf_admin[slave].vport[port];
|
||||
vf_oper = &priv->mfunc.master.vf_oper[slave].vport[port];
|
||||
|
||||
if ((0 == vlan) && (0 == qos))
|
||||
vf_admin->default_vlan = MLX4_VGT;
|
||||
|
|
|
@ -645,7 +645,7 @@ static const u8 __promisc_mode[] = {
|
|||
int mlx4_map_sw_to_hw_steering_mode(struct mlx4_dev *dev,
|
||||
enum mlx4_net_trans_promisc_mode flow_type)
|
||||
{
|
||||
if (flow_type >= MLX4_FS_MODE_NUM || flow_type < 0) {
|
||||
if (flow_type >= MLX4_FS_MODE_NUM) {
|
||||
mlx4_err(dev, "Invalid flow type. type = %d\n", flow_type);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -681,7 +681,7 @@ const u16 __sw_id_hw[] = {
|
|||
int mlx4_map_sw_to_hw_steering_id(struct mlx4_dev *dev,
|
||||
enum mlx4_net_trans_rule_id id)
|
||||
{
|
||||
if (id >= MLX4_NET_TRANS_RULE_NUM || id < 0) {
|
||||
if (id >= MLX4_NET_TRANS_RULE_NUM) {
|
||||
mlx4_err(dev, "Invalid network rule id. id = %d\n", id);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -706,7 +706,7 @@ static const int __rule_hw_sz[] = {
|
|||
int mlx4_hw_rule_sz(struct mlx4_dev *dev,
|
||||
enum mlx4_net_trans_rule_id id)
|
||||
{
|
||||
if (id >= MLX4_NET_TRANS_RULE_NUM || id < 0) {
|
||||
if (id >= MLX4_NET_TRANS_RULE_NUM) {
|
||||
mlx4_err(dev, "Invalid network rule id. id = %d\n", id);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
#include <linux/init.h>
|
||||
|
||||
#include <linux/mlx4/cmd.h>
|
||||
#include <linux/mlx4/srq.h>
|
||||
#include <linux/export.h>
|
||||
#include <linux/gfp.h>
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче