diff options
| author | Doug Ledford <dledford@redhat.com> | 2016-12-14 14:44:25 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-12-14 14:44:25 -0500 |
| commit | 86ef0beaa0bdbec70d4261977b8b4a100fe54bfe (patch) | |
| tree | d2c1b52a7a6e493bada10dbdbcd2f8511baccc66 /drivers/infiniband/ulp | |
| parent | 253f8b22e0ad643edafd75e831e5c765732877f5 (diff) | |
| parent | 7ceb740c540dde362b3055ad92c6a38009eb7a83 (diff) | |
Merge branch 'mlx' into merge-test
Diffstat (limited to 'drivers/infiniband/ulp')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c index 44f152e431cb..46234f52ee29 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c @@ -1050,8 +1050,6 @@ static struct ib_qp *ipoib_cm_create_tx_qp(struct net_device *dev, struct ipoib_ tx_qp = ib_create_qp(priv->pd, &attr); if (PTR_ERR(tx_qp) == -EINVAL) { - ipoib_warn(priv, "can't use GFP_NOIO for QPs on device %s, using GFP_KERNEL\n", - priv->ca->name); attr.create_flags &= ~IB_QP_CREATE_USE_GFP_NOIO; tx_qp = ib_create_qp(priv->pd, &attr); } |