aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-17 16:26:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-17 16:26:30 -0700
commitbf6740281ed599f98ba13eb3f017ca83deb6277f (patch)
tree8078764b0d2890e87f77ba0d656212b2c2a33be3
parent4e7fca0d0afdfa6be0f429f9a2649b3cf92197e7 (diff)
parent3661df179bfbd1bb21cf2c782d3c5c084ebe3cf4 (diff)
downloadktls-bf6740281ed599f98ba13eb3f017ca83deb6277f.tar.gz
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull rdma bugfix from Doug Ledford: "Bugfix in iw_cxgb4" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: iw_cxgb4: gracefully handle unknown CQE status errors
-rw-r--r--drivers/infiniband/hw/cxgb4/cq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
index c7aab48f07cdf..92d518382a9fc 100644
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
@@ -814,7 +814,7 @@ static int c4iw_poll_cq_one(struct c4iw_cq *chp, struct ib_wc *wc)
printk(KERN_ERR MOD
"Unexpected cqe_status 0x%x for QPID=0x%0x\n",
CQE_STATUS(&cqe), CQE_QPID(&cqe));
- ret = -EINVAL;
+ wc->status = IB_WC_FATAL_ERR;
}
}
out: