diff options
| author | Joel Stanley <joel@jms.id.au> | 2019-04-08 12:35:00 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-04-08 12:35:05 +0930 |
| commit | 0b37f9a0bd24d9622f75d981feac67e72351b6e8 (patch) | |
| tree | d40154b713e136a2d9dfb3fcb1903dd730bd234f /drivers/infiniband/hw/cxgb4/cm.c | |
| parent | df66fbc97853fbba90a0bfa44de32f3d5f7602b4 (diff) | |
| parent | 8b298d3a0bd5feeb47129c4889356b38b78ab231 (diff) | |
| download | talos-obmc-linux-0b37f9a0bd24d9622f75d981feac67e72351b6e8.tar.gz talos-obmc-linux-0b37f9a0bd24d9622f75d981feac67e72351b6e8.zip | |
Merge tag 'v5.0.7' into dev-5.0
This is the 5.0.7 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/infiniband/hw/cxgb4/cm.c')
| -rw-r--r-- | drivers/infiniband/hw/cxgb4/cm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c index 8221813219e5..25a81fbb0d4d 100644 --- a/drivers/infiniband/hw/cxgb4/cm.c +++ b/drivers/infiniband/hw/cxgb4/cm.c @@ -1903,8 +1903,10 @@ static int abort_rpl(struct c4iw_dev *dev, struct sk_buff *skb) } mutex_unlock(&ep->com.mutex); - if (release) + if (release) { + close_complete_upcall(ep, -ECONNRESET); release_ep_resources(ep); + } c4iw_put_ep(&ep->com); return 0; } @@ -3606,7 +3608,6 @@ int c4iw_ep_disconnect(struct c4iw_ep *ep, int abrupt, gfp_t gfp) if (close) { if (abrupt) { set_bit(EP_DISC_ABORT, &ep->com.history); - close_complete_upcall(ep, -ECONNRESET); ret = send_abort(ep); } else { set_bit(EP_DISC_CLOSE, &ep->com.history); |
