[PATCH] IB/ipath: share more common code between RC and UC protocols

Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Cc: "Michael S. Tsirkin" <mst@mellanox.co.il>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_qp.c b/drivers/infiniband/hw/ipath/ipath_qp.c
index 28fffbd4bee6..e1d31bccf3eb 100644
--- a/drivers/infiniband/hw/ipath/ipath_qp.c
+++ b/drivers/infiniband/hw/ipath/ipath_qp.c
@@ -709,9 +709,7 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd,
                 spin_lock_init(&qp->r_rq.lock);
                 atomic_set(&qp->refcount, 0);
                 init_waitqueue_head(&qp->wait);
-                tasklet_init(&qp->s_task,
-                             init_attr->qp_type == IB_QPT_RC ?
-                             ipath_do_rc_send : ipath_do_uc_send,
+                tasklet_init(&qp->s_task, ipath_do_ruc_send,
                              (unsigned long)qp);
                 INIT_LIST_HEAD(&qp->piowait);
                 INIT_LIST_HEAD(&qp->timerwait);
@@ -896,9 +894,9 @@ void ipath_get_credit(struct ipath_qp *qp, u32 aeth)
          * as many packets as we like.  Otherwise, we have to
          * honor the credit field.
          */
-        if (credit == IPS_AETH_CREDIT_INVAL) {
+        if (credit == IPS_AETH_CREDIT_INVAL)
                 qp->s_lsn = (u32) -1;
-        } else if (qp->s_lsn != (u32) -1) {
+        else if (qp->s_lsn != (u32) -1) {
                 /* Compute new LSN (i.e., MSN + credit) */
                 credit = (aeth + credit_table[credit]) & IPS_MSN_MASK;
                 if (ipath_cmp24(credit, qp->s_lsn) > 0)