IPoIB Multicast and CM changes for batching support.

Signed-off-by: Krishna Kumar <[EMAIL PROTECTED]>
---
 ipoib_cm.c        |   13 +++++++++----
 ipoib_multicast.c |    4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff -ruNp org/drivers/infiniband/ulp/ipoib/ipoib_cm.c 
new/drivers/infiniband/ulp/ipoib/ipoib_cm.c
--- org/drivers/infiniband/ulp/ipoib/ipoib_cm.c 2007-07-20 07:49:28.000000000 
+0530
+++ new/drivers/infiniband/ulp/ipoib/ipoib_cm.c 2007-07-20 08:30:22.000000000 
+0530
@@ -493,14 +493,19 @@ static inline int post_send(struct ipoib
                            unsigned int wr_id,
                            u64 addr, int len)
 {
+       int ret;
        struct ib_send_wr *bad_wr;
 
-       priv->tx_sge.addr             = addr;
-       priv->tx_sge.length           = len;
+       priv->tx_sge[0].addr          = addr;
+       priv->tx_sge[0].length        = len;
+
+       priv->tx_wr[0].wr_id          = wr_id;
 
-       priv->tx_wr.wr_id             = wr_id;
+       priv->tx_wr[0].next = NULL;
+       ret = ib_post_send(tx->qp, priv->tx_wr, &bad_wr);
+       priv->tx_wr[0].next = &priv->tx_wr[1];
 
-       return ib_post_send(tx->qp, &priv->tx_wr, &bad_wr);
+       return ret;
 }
 
 void ipoib_cm_send(struct net_device *dev, struct sk_buff *skb, struct 
ipoib_cm_tx *tx)
diff -ruNp org/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 
new/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
--- org/drivers/infiniband/ulp/ipoib/ipoib_multicast.c  2007-07-20 
07:49:28.000000000 +0530
+++ new/drivers/infiniband/ulp/ipoib/ipoib_multicast.c  2007-07-20 
08:30:22.000000000 +0530
@@ -217,7 +217,7 @@ static int ipoib_mcast_join_finish(struc
        if (!memcmp(mcast->mcmember.mgid.raw, priv->dev->broadcast + 4,
                    sizeof (union ib_gid))) {
                priv->qkey = be32_to_cpu(priv->broadcast->mcmember.qkey);
-               priv->tx_wr.wr.ud.remote_qkey = priv->qkey;
+               priv->tx_wr[0].wr.ud.remote_qkey = priv->qkey;
        }
 
        if (!test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {
@@ -736,7 +736,7 @@ out:
                        }
                }
 
-               ipoib_send(dev, skb, mcast->ah, IB_MULTICAST_QPN);
+               ipoib_send(dev, skb, mcast->ah, IB_MULTICAST_QPN, 1);
        }
 
 unlock:
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to