diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-18 01:26:30 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-18 01:26:30 +0200 |
commit | bf6740281ed599f98ba13eb3f017ca83deb6277f (patch) | |
tree | 8078764b0d2890e87f77ba0d656212b2c2a33be3 /drivers/infiniband | |
parent | Merge branch 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | iw_cxgb4: gracefully handle unknown CQE status errors (diff) | |
download | linux-bf6740281ed599f98ba13eb3f017ca83deb6277f.tar.xz linux-bf6740281ed599f98ba13eb3f017ca83deb6277f.zip |
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
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/hw/cxgb4/cq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c index c7aab48f07cd..92d518382a9f 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: |