diff options
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/mcg.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mcg.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c index 80ccb4edf825..7c6eba622186 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mcg.c +++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c | |||
@@ -638,7 +638,7 @@ static int find_entry(struct mlx4_dev *dev, u8 port, | |||
638 | 638 | ||
639 | if (!(be32_to_cpu(mgm->members_count) & 0xffffff)) { | 639 | if (!(be32_to_cpu(mgm->members_count) & 0xffffff)) { |
640 | if (*index != hash) { | 640 | if (*index != hash) { |
641 | mlx4_err(dev, "Found zero MGID in AMGM.\n"); | 641 | mlx4_err(dev, "Found zero MGID in AMGM\n"); |
642 | err = -EINVAL; | 642 | err = -EINVAL; |
643 | } | 643 | } |
644 | return err; | 644 | return err; |
@@ -874,7 +874,7 @@ static void mlx4_err_rule(struct mlx4_dev *dev, char *str, | |||
874 | mlx4_err(dev, "%s", buf); | 874 | mlx4_err(dev, "%s", buf); |
875 | 875 | ||
876 | if (len >= BUF_SIZE) | 876 | if (len >= BUF_SIZE) |
877 | mlx4_err(dev, "Network rule error message was truncated, print buffer is too small.\n"); | 877 | mlx4_err(dev, "Network rule error message was truncated, print buffer is too small\n"); |
878 | } | 878 | } |
879 | 879 | ||
880 | int mlx4_flow_attach(struct mlx4_dev *dev, | 880 | int mlx4_flow_attach(struct mlx4_dev *dev, |
@@ -905,10 +905,10 @@ int mlx4_flow_attach(struct mlx4_dev *dev, | |||
905 | ret = mlx4_QP_FLOW_STEERING_ATTACH(dev, mailbox, size >> 2, reg_id); | 905 | ret = mlx4_QP_FLOW_STEERING_ATTACH(dev, mailbox, size >> 2, reg_id); |
906 | if (ret == -ENOMEM) | 906 | if (ret == -ENOMEM) |
907 | mlx4_err_rule(dev, | 907 | mlx4_err_rule(dev, |
908 | "mcg table is full. Fail to register network rule.\n", | 908 | "mcg table is full. Fail to register network rule\n", |
909 | rule); | 909 | rule); |
910 | else if (ret) | 910 | else if (ret) |
911 | mlx4_err_rule(dev, "Fail to register network rule.\n", rule); | 911 | mlx4_err_rule(dev, "Fail to register network rule\n", rule); |
912 | 912 | ||
913 | mlx4_free_cmd_mailbox(dev, mailbox); | 913 | mlx4_free_cmd_mailbox(dev, mailbox); |
914 | 914 | ||
@@ -994,7 +994,7 @@ int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16], | |||
994 | 994 | ||
995 | members_count = be32_to_cpu(mgm->members_count) & 0xffffff; | 995 | members_count = be32_to_cpu(mgm->members_count) & 0xffffff; |
996 | if (members_count == dev->caps.num_qp_per_mgm) { | 996 | if (members_count == dev->caps.num_qp_per_mgm) { |
997 | mlx4_err(dev, "MGM at index %x is full.\n", index); | 997 | mlx4_err(dev, "MGM at index %x is full\n", index); |
998 | err = -ENOMEM; | 998 | err = -ENOMEM; |
999 | goto out; | 999 | goto out; |
1000 | } | 1000 | } |
@@ -1042,7 +1042,7 @@ out: | |||
1042 | } | 1042 | } |
1043 | if (err && link && index != -1) { | 1043 | if (err && link && index != -1) { |
1044 | if (index < dev->caps.num_mgms) | 1044 | if (index < dev->caps.num_mgms) |
1045 | mlx4_warn(dev, "Got AMGM index %d < %d", | 1045 | mlx4_warn(dev, "Got AMGM index %d < %d\n", |
1046 | index, dev->caps.num_mgms); | 1046 | index, dev->caps.num_mgms); |
1047 | else | 1047 | else |
1048 | mlx4_bitmap_free(&priv->mcg_table.bitmap, | 1048 | mlx4_bitmap_free(&priv->mcg_table.bitmap, |
@@ -1133,7 +1133,7 @@ int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16], | |||
1133 | 1133 | ||
1134 | if (amgm_index) { | 1134 | if (amgm_index) { |
1135 | if (amgm_index < dev->caps.num_mgms) | 1135 | if (amgm_index < dev->caps.num_mgms) |
1136 | mlx4_warn(dev, "MGM entry %d had AMGM index %d < %d", | 1136 | mlx4_warn(dev, "MGM entry %d had AMGM index %d < %d\n", |
1137 | index, amgm_index, dev->caps.num_mgms); | 1137 | index, amgm_index, dev->caps.num_mgms); |
1138 | else | 1138 | else |
1139 | mlx4_bitmap_free(&priv->mcg_table.bitmap, | 1139 | mlx4_bitmap_free(&priv->mcg_table.bitmap, |
@@ -1153,7 +1153,7 @@ int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16], | |||
1153 | goto out; | 1153 | goto out; |
1154 | 1154 | ||
1155 | if (index < dev->caps.num_mgms) | 1155 | if (index < dev->caps.num_mgms) |
1156 | mlx4_warn(dev, "entry %d had next AMGM index %d < %d", | 1156 | mlx4_warn(dev, "entry %d had next AMGM index %d < %d\n", |
1157 | prev, index, dev->caps.num_mgms); | 1157 | prev, index, dev->caps.num_mgms); |
1158 | else | 1158 | else |
1159 | mlx4_bitmap_free(&priv->mcg_table.bitmap, | 1159 | mlx4_bitmap_free(&priv->mcg_table.bitmap, |