Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69736279 authored by Hariprasad S's avatar Hariprasad S Committed by Doug Ledford
Browse files

RDMA/iw_cxgb4: remove abort_connection() usage from ep_timeout() 



Use c4iw_ep_disconnect() instead.  This is part of getting rid of
abort_connection() altogether so we properly clean up on send_abort()
failures.

This is the last user of abort_connection(), so remove it too.

Signed-off-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent c00dcbaf

drivers/infiniband/hw/cxgb4/cm.c

+2 −10
Original line number Diff line number Diff line
@@ -1179,14 +1179,6 @@ static void close_complete_upcall(struct c4iw_ep *ep, int status) 
	}

}



static int abort_connection(struct c4iw_ep *ep, struct sk_buff *skb, gfp_t gfp)

{

	PDBG("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	__state_set(&ep->com, ABORTING);

	set_bit(ABORT_CONN, &ep->com.history);

	return send_abort(ep, skb, gfp);

}



static void peer_close_upcall(struct c4iw_ep *ep)

{

	struct iw_cm_event event;
@@ -3977,9 +3969,9 @@ static void process_timeout(struct c4iw_ep *ep) 
			__func__, ep, ep->hwtid, ep->com.state);

		abort = 0;

	}

	if (abort)

		abort_connection(ep, NULL, GFP_KERNEL);

	mutex_unlock(&ep->com.mutex);

	if (abort)

		c4iw_ep_disconnect(ep, 1, GFP_KERNEL);

	c4iw_put_ep(&ep->com);

}