From 13f5d45977414ea94ff6650c97c086323bc9e5f3 Mon Sep 17 00:00:00 2001 From: Julien Brunel Date: Thu, 7 Aug 2008 14:11:56 -0700 Subject: [PATCH] --- yaml --- r: 107931 b: refs/heads/master c: cd55ef5a10d1a2ea09853bc5fa40aadaf9f80614 h: refs/heads/master i: 107929: 3af25ec4f9e171704c18f59eb2b707df23e7656c 107927: ef232dee19efc890289df97a5d88a0729c5f720e v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/mad_rmpp.c | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cb6b9e4aee87..a3b0279ac0d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e08198169ec5facb3d85bb455efa44a2f8327842 +refs/heads/master: cd55ef5a10d1a2ea09853bc5fa40aadaf9f80614 diff --git a/trunk/drivers/infiniband/core/mad_rmpp.c b/trunk/drivers/infiniband/core/mad_rmpp.c index d0ef7d61c037..3af2b84cd838 100644 --- a/trunk/drivers/infiniband/core/mad_rmpp.c +++ b/trunk/drivers/infiniband/core/mad_rmpp.c @@ -133,7 +133,7 @@ static void ack_recv(struct mad_rmpp_recv *rmpp_recv, msg = ib_create_send_mad(&rmpp_recv->agent->agent, recv_wc->wc->src_qp, recv_wc->wc->pkey_index, 1, hdr_len, 0, GFP_KERNEL); - if (!msg) + if (IS_ERR(msg)) return; format_ack(msg, (struct ib_rmpp_mad *) recv_wc->recv_buf.mad, rmpp_recv); diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c index 7ebc400a4b3d..0f2d3045061a 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c @@ -337,7 +337,7 @@ static void ipoib_cm_init_rx_wr(struct net_device *dev, sge[i].length = PAGE_SIZE; wr->next = NULL; - wr->sg_list = sge; + wr->sg_list = priv->cm.rx_sge; wr->num_sge = priv->cm.num_frags; }