From: Roland Dreier <roland@purestorage.com>
Date: Tue, 10 Jun 2014 17:12:14 +0000 (-0700)
Subject: Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5',... 
X-Git-Tag: firefly_0821_release~176^2~3797^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=eeaddf3670d4974e17268ec78a576ad397e2dcd9;p=firefly-linux-kernel-4.4.55.git

Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next
---

eeaddf3670d4974e17268ec78a576ad397e2dcd9
diff --cc drivers/infiniband/hw/mlx4/qp.c
index 41308af4163c,41308af4163c,41308af4163c,41308af4163c,41308af4163c,41308af4163c,b25600997cb6,41308af4163c,a0bfda275647,41308af4163c,41308af4163c,41308af4163c,41308af4163c..5b0cb8e2d807
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@@@@@@@@@@@@@ -608,9 -608,9 -608,9 -608,9 -608,9 -608,9 -608,19 -608,9 -608,10 -608,9 -608,9 -608,9 -608,9 +608,20 @@@@@@@@@@@@@@ static int qp_has_rq(struct ib_qp_init_
             	return !attr->srq;
             }
             
++++++ ++++++static int qp0_enabled_vf(struct mlx4_dev *dev, int qpn)
++++++ ++++++{
++++++ ++++++	int i;
++++++ ++++++	for (i = 0; i < dev->caps.num_ports; i++) {
++++++ ++++++		if (qpn == dev->caps.qp0_proxy[i])
++++++ ++++++			return !!dev->caps.qp0_qkey[i];
++++++ ++++++	}
++++++ ++++++	return 0;
++++++ ++++++}
++++++ ++++++
             static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
             			    struct ib_qp_init_attr *init_attr,
-------- ----			    struct ib_udata *udata, int sqpn, struct mlx4_ib_qp **caller_qp)
++++++++ ++++			    struct ib_udata *udata, int sqpn, struct mlx4_ib_qp **caller_qp,
++++++++ ++++			    gfp_t gfp)
             {
             	int qpn;
             	int err;