Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

bf674028 · Linus Torvalds <[email protected]> · 2015-08-17 16:26:30 -07:00

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

Commit: bf6740281ed599f98ba13eb3f017ca83deb6277f
Parents: 4e7fca0d · 3661df17

Merge commit. Changes below are compared with the first parent: 4e7fca0d.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/infiniband/hw/cxgb4/cq.c	modified	+1	−1	View file

drivers/infiniband/hw/cxgb4/cq.c

View file

diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
index c7aab48..92d5183 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: