diff options
| author | David S. Miller | 2015-08-21 11:44:04 -0700 |
|---|---|---|
| committer | David S. Miller | 2015-08-21 11:44:04 -0700 |
| commit | dc25b25897289bad4907f30151ffe5baf75ff369 (patch) | |
| tree | c99301de2cdf66d7af48fc43b6161bda6faaae70 /drivers/infiniband | |
| parent | 1a69205c471221a7f9101df164642611e37c52e4 (diff) | |
| parent | 0bad90985d39e69ca035fdd70bcc743812641d18 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/qmi_wwan.c
Overlapping additions of new device IDs to qmi_wwan.c
Signed-off-by: David S. Miller <davem@davemloft.net>
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: |