1 files changed, 15 insertions, 17 deletions

diff --git a/drivers/infiniband/hw/qib/qib_qp.c b/drivers/infiniband/hw/qib/qib_qp.c
index 6c39851d2ded..e16751f8639e 100644
--- a/drivers/infiniband/hw/qib/qib_qp.c
+++ b/drivers/infiniband/hw/qib/qib_qp.c
@@ -48,13 +48,12 @@ static inline unsigned mk_qpn(struct qib_qpn_table *qpt,
 
 static inline unsigned find_next_offset(struct qib_qpn_table *qpt,
                                         struct qpn_map *map, unsigned off,
-                                        unsigned r)
+                                        unsigned n)
 {
         if (qpt->mask) {
                 off++;
-                if ((off & qpt->mask) >> 1 != r)
-                        off = ((off & qpt->mask) ?
-                                (off | qpt->mask) + 1 : off) | (r << 1);
+                if (((off & qpt->mask) >> 1) >= n)
+                        off = (off | qpt->mask) + 2;
         } else
                 off = find_next_zero_bit(map->page, BITS_PER_PAGE, off);
         return off;
@@ -123,7 +122,6 @@ static int alloc_qpn(struct qib_devdata *dd, struct qib_qpn_table *qpt,
         u32 i, offset, max_scan, qpn;
         struct qpn_map *map;
         u32 ret;
-        int r;
 
         if (type == IB_QPT_SMI || type == IB_QPT_GSI) {
                 unsigned n;
@@ -139,15 +137,11 @@ static int alloc_qpn(struct qib_devdata *dd, struct qib_qpn_table *qpt,
                 goto bail;
         }
 
-        r = smp_processor_id();
-        if (r >= dd->n_krcv_queues)
-                r %= dd->n_krcv_queues;
-        qpn = qpt->last + 1;
+        qpn = qpt->last + 2;
         if (qpn >= QPN_MAX)
                 qpn = 2;
-        if (qpt->mask && ((qpn & qpt->mask) >> 1) != r)
-                qpn = ((qpn & qpt->mask) ? (qpn | qpt->mask) + 1 : qpn) |
-                        (r << 1);
+        if (qpt->mask && ((qpn & qpt->mask) >> 1) >= dd->n_krcv_queues)
+                qpn = (qpn | qpt->mask) + 2;
         offset = qpn & BITS_PER_PAGE_MASK;
         map = &qpt->map[qpn / BITS_PER_PAGE];
         max_scan = qpt->nmaps - !offset;
@@ -163,7 +157,8 @@ static int alloc_qpn(struct qib_devdata *dd, struct qib_qpn_table *qpt,
                                 ret = qpn;
                                 goto bail;
                         }
-                        offset = find_next_offset(qpt, map, offset, r);
+                        offset = find_next_offset(qpt, map, offset,
+                                dd->n_krcv_queues);
                         qpn = mk_qpn(qpt, map, offset);
                         /*
                          * This test differs from alloc_pidmap().
@@ -183,13 +178,13 @@ static int alloc_qpn(struct qib_devdata *dd, struct qib_qpn_table *qpt,
                         if (qpt->nmaps == QPNMAP_ENTRIES)
                                 break;
                         map = &qpt->map[qpt->nmaps++];
-                        offset = qpt->mask ? (r << 1) : 0;
+                        offset = 0;
                 } else if (map < &qpt->map[qpt->nmaps]) {
                         ++map;
-                        offset = qpt->mask ? (r << 1) : 0;
+                        offset = 0;
                 } else {
                         map = &qpt->map[0];
-                        offset = qpt->mask ? (r << 1) : 2;
+                        offset = 2;
                 }
                 qpn = mk_qpn(qpt, map, offset);
         }
@@ -468,6 +463,10 @@ int qib_error_qp(struct qib_qp *qp, enum ib_wc_status err)
                 qp->s_flags &= ~(QIB_S_TIMER | QIB_S_WAIT_RNR);
                 del_timer(&qp->s_timer);
         }
+
+        if (qp->s_flags & QIB_S_ANY_WAIT_SEND)
+                qp->s_flags &= ~QIB_S_ANY_WAIT_SEND;
+
         spin_lock(&dev->pending_lock);
         if (!list_empty(&qp->iowait) && !(qp->s_flags & QIB_S_BUSY)) {
                 qp->s_flags &= ~QIB_S_ANY_WAIT_IO;
@@ -1061,7 +1060,6 @@ struct ib_qp *qib_create_qp(struct ib_pd *ibpd,
                 }
                 qp->ibqp.qp_num = err;
                 qp->port_num = init_attr->port_num;
-                qp->processor_id = smp_processor_id();
                 qib_reset_qp(qp, init_attr->qp_type);
                 break;