Merge tag 'pwm/for-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[~andy/linux] / drivers / net / ethernet / mellanox / mlx4 / mcg.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index bfe65f7be91c7f46b50c8afc4bd03272112e7ab4..db7dc0b6667d6f1ecb57076db2e855bd7a9cb448 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -928,6 +928,23 @@ int mlx4_flow_detach(struct mlx4_dev *dev, u64 reg_id)
 }
 EXPORT_SYMBOL_GPL(mlx4_flow_detach);
 
+int mlx4_FLOW_STEERING_IB_UC_QP_RANGE(struct mlx4_dev *dev, u32 min_range_qpn,
+                                     u32 max_range_qpn)
+{
+       int err;
+       u64 in_param;
+
+       in_param = ((u64) min_range_qpn) << 32;
+       in_param |= ((u64) max_range_qpn) & 0xFFFFFFFF;
+
+       err = mlx4_cmd(dev, in_param, 0, 0,
+                       MLX4_FLOW_STEERING_IB_UC_QP_RANGE,
+                       MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);
+
+       return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_FLOW_STEERING_IB_UC_QP_RANGE);
+
 int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
                          int block_mcast_loopback, enum mlx4_protocol prot,
                          enum mlx4_steer_type steer)
@@ -943,9 +960,6 @@ int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
        u8 port = gid[5];
        u8 new_entry = 0;
 
-       if (port < 1 || port > dev->caps.num_ports)
-               return -EINVAL;
-
        mailbox = mlx4_alloc_cmd_mailbox(dev);
        if (IS_ERR(mailbox))
                return PTR_ERR(mailbox);