Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / drivers / infiniband / ulp / ipoib / ipoib_cm.c

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 1afd93cdd6bbb759bafd3878cbb962a0798efce3..0a0dcb8fdfd1ac2ca54ec326974341a6ff187baa 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -810,14 +810,16 @@ static int ipoib_cm_rep_handler(struct ib_cm_id *cm_id, struct ib_cm_event *even
 static struct ib_qp *ipoib_cm_create_tx_qp(struct net_device *dev, struct ib_cq *cq)
 {
        struct ipoib_dev_priv *priv = netdev_priv(dev);
-       struct ib_qp_init_attr attr = {};
-       attr.recv_cq = priv->cq;
-       attr.srq = priv->cm.srq;
-       attr.cap.max_send_wr = ipoib_sendq_size;
-       attr.cap.max_send_sge = 1;
-       attr.sq_sig_type = IB_SIGNAL_ALL_WR;
-       attr.qp_type = IB_QPT_RC;
-       attr.send_cq = cq;
+       struct ib_qp_init_attr attr = {
+               .send_cq                = cq,
+               .recv_cq                = priv->cq,
+               .srq                    = priv->cm.srq,
+               .cap.max_send_wr        = ipoib_sendq_size,
+               .cap.max_send_sge       = 1,
+               .sq_sig_type            = IB_SIGNAL_ALL_WR,
+               .qp_type                = IB_QPT_RC,
+        };
+
        return ib_create_qp(priv->pd, &attr);
 }