diff options
author | Devesh Sharma <devesh.sharma@emulex.com> | 2014-06-09 10:52:38 +0530 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2014-09-19 09:53:35 -0700 |
commit | f93439e476d012b2503dbb07fe0fc675bcbff099 (patch) | |
tree | 9afc6733da4b0a764b89e3a82226b6688191afe5 /drivers/infiniband/hw | |
parent | d6a488f21c0f3c44bfbb2339a75159ee55aa2b6f (diff) | |
download | blackbird-op-linux-f93439e476d012b2503dbb07fe0fc675bcbff099.tar.gz blackbird-op-linux-f93439e476d012b2503dbb07fe0fc675bcbff099.zip |
RDMA/ocrdma: Do not skip setting deferred_arm
When ib_request_notify_cq() is called for the first time, ocrdma tries
to skip setting deffered_arm flag. This may lead CQ to an un-armed
state thus never generating a CQ event and leaving consumer hung.
This patch removes the part of code that skips setting deferred_arm.
Signed-off-by: Devesh Sharma <devesh.sharma@emulex.com>
Signed-off-by: Selvin Xavier <selvin.xavier@emulex.com>
Signed-off-by: Mitesh Ahuja <mitesh.ahuja@emulex.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/hw')
-rw-r--r-- | drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index 4527311171c5..8f5f2577f288 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c @@ -2846,11 +2846,9 @@ int ocrdma_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags cq_flags) if (cq->first_arm) { ocrdma_ring_cq_db(dev, cq_id, arm_needed, sol_needed, 0); cq->first_arm = false; - goto skip_defer; } - cq->deferred_arm = true; -skip_defer: + cq->deferred_arm = true; cq->deferred_sol = sol_needed; spin_unlock_irqrestore(&cq->cq_lock, flags); |