diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-10-18 20:07:13 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-10-18 20:07:13 +0300 |
| commit | 754137a769ac8f13cd6c0e1bc4fc2fa768d3da63 (patch) | |
| tree | 0a39eda714b8b0bb3522654fb326e499fbe552e7 /drivers/infiniband/hw/cxgb3/iwch_cm.c | |
| parent | e980b44134c89afb65176e70aaf293d608002e83 (diff) | |
| parent | 4c532d6ce14bb3fb4e1cb2d29fafdd7d6bded51c (diff) | |
| download | linux-754137a769ac8f13cd6c0e1bc4fc2fa768d3da63.tar.xz | |
Merge branch 'for-next-early' into for-next
The early for-next branch was based on v4.14-rc2, while the shared pull
request I got from Mellanox used a v4.14-rc4 base. I'm making the
branch that was the shared Mellanox pull request the new for-next branch
and merging the early for-next branch into it.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/cxgb3/iwch_cm.c')
| -rw-r--r-- | drivers/infiniband/hw/cxgb3/iwch_cm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c index 86975370a4c0..edc1c549289e 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_cm.c +++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c @@ -1760,8 +1760,8 @@ static void ep_timeout(unsigned long arg) int iwch_reject_cr(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len) { - int err; struct iwch_ep *ep = to_ep(cm_id); + pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid); if (state_read(&ep->com) == DEAD) { @@ -1772,8 +1772,8 @@ int iwch_reject_cr(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len) if (mpa_rev == 0) abort_connection(ep, NULL, GFP_KERNEL); else { - err = send_mpa_reject(ep, pdata, pdata_len); - err = iwch_ep_disconnect(ep, 0, GFP_KERNEL); + send_mpa_reject(ep, pdata, pdata_len); + iwch_ep_disconnect(ep, 0, GFP_KERNEL); } put_ep(&ep->com); return 0; |