These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / infiniband / hw / mlx4 / mcg.c

diff --git a/kernel/drivers/infiniband/hw/mlx4/mcg.c b/kernel/drivers/infiniband/hw/mlx4/mcg.c
index a0559a8..99451d8 100644 (file)
--- a/kernel/drivers/infiniband/hw/mlx4/mcg.c
+++ b/kernel/drivers/infiniband/hw/mlx4/mcg.c
@@ -51,6 +51,10 @@
        pr_warn("%s-%d: %16s (port %d): WARNING: " format, __func__, __LINE__,\
        (group)->name, group->demux->port, ## arg)
 
+#define mcg_debug_group(group, format, arg...) \
+       pr_debug("%s-%d: %16s (port %d): WARNING: " format, __func__, __LINE__,\
+                (group)->name, (group)->demux->port, ## arg)
+
 #define mcg_error_group(group, format, arg...) \
        pr_err("  %16s: " format, (group)->name, ## arg)
 
@@ -218,7 +222,7 @@ static int send_mad_to_wire(struct mlx4_ib_demux_ctx *ctx, struct ib_mad *mad)
        spin_unlock_irqrestore(&dev->sm_lock, flags);
        return mlx4_ib_send_to_wire(dev, mlx4_master_func_num(dev->dev),
                                    ctx->port, IB_QPT_GSI, 0, 1, IB_QP1_QKEY,
-                                   &ah_attr, NULL, mad);
+                                   &ah_attr, NULL, 0xffff, mad);
 }
 
 static int send_mad_to_slave(int slave, struct mlx4_ib_demux_ctx *ctx,
@@ -962,8 +966,8 @@ int mlx4_ib_mcg_multiplex_handler(struct ib_device *ibdev, int port,
                mutex_lock(&group->lock);
                if (group->func[slave].num_pend_reqs > MAX_PEND_REQS_PER_FUNC) {
                        mutex_unlock(&group->lock);
-                       mcg_warn_group(group, "Port %d, Func %d has too many pending requests (%d), dropping\n",
-                                      port, slave, MAX_PEND_REQS_PER_FUNC);
+                       mcg_debug_group(group, "Port %d, Func %d has too many pending requests (%d), dropping\n",
+                                       port, slave, MAX_PEND_REQS_PER_FUNC);
                        release_group(group, 0);
                        kfree(req);
                        return -ENOMEM;