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

Commit d760ce8f authored by Hal Rosenstock's avatar Hal Rosenstock Committed by Linus Torvalds
Browse files

[PATCH] IB: Change ib_mad_send_wr_private struct 



Have ib_mad_send_wr_private reference the private agent structure directly,
rather than the exposed agent definition.  Remove unneeded parameters to
functions and simplify code were possible from this change.

Signed-off-by: default avatarSean Hefty <sean.hefty@intel.com>
Signed-off-by: default avatarHal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f8197a4e

drivers/infiniband/core/mad.c

+10 −12
Original line number Original line Diff line number Diff line
@@ -839,8 +839,7 @@ void ib_free_send_mad(struct ib_mad_send_buf *send_buf) 
}

}

EXPORT_SYMBOL(ib_free_send_mad);

EXPORT_SYMBOL(ib_free_send_mad);





static int ib_send_mad(struct ib_mad_agent_private *mad_agent_priv,

static int ib_send_mad(struct ib_mad_send_wr_private *mad_send_wr)

		       struct ib_mad_send_wr_private *mad_send_wr)

{

{

	struct ib_mad_qp_info *qp_info;

	struct ib_mad_qp_info *qp_info;

	struct ib_send_wr *bad_send_wr;

	struct ib_send_wr *bad_send_wr;
@@ -848,7 +847,7 @@ static int ib_send_mad(struct ib_mad_agent_private *mad_agent_priv, 
	int ret;

	int ret;





	/* Set WR ID to find mad_send_wr upon completion */

	/* Set WR ID to find mad_send_wr upon completion */

	qp_info = mad_agent_priv->qp_info;

	qp_info = mad_send_wr->mad_agent_priv->qp_info;

	mad_send_wr->send_wr.wr_id = (unsigned long)&mad_send_wr->mad_list;

	mad_send_wr->send_wr.wr_id = (unsigned long)&mad_send_wr->mad_list;

	mad_send_wr->mad_list.mad_queue = &qp_info->send_queue;

	mad_send_wr->mad_list.mad_queue = &qp_info->send_queue;
@@ -857,7 +856,7 @@ static int ib_send_mad(struct ib_mad_agent_private *mad_agent_priv, 
		list_add_tail(&mad_send_wr->mad_list.list,

		list_add_tail(&mad_send_wr->mad_list.list,

			      &qp_info->send_queue.list);

			      &qp_info->send_queue.list);

		spin_unlock_irqrestore(&qp_info->send_queue.lock, flags);

		spin_unlock_irqrestore(&qp_info->send_queue.lock, flags);

		ret = ib_post_send(mad_agent_priv->agent.qp,

		ret = ib_post_send(mad_send_wr->mad_agent_priv->agent.qp,

				   &mad_send_wr->send_wr, &bad_send_wr);

				   &mad_send_wr->send_wr, &bad_send_wr);

		if (ret) {

		if (ret) {

			printk(KERN_ERR PFX "ib_post_send failed: %d\n", ret);

			printk(KERN_ERR PFX "ib_post_send failed: %d\n", ret);
@@ -950,7 +949,7 @@ int ib_post_send_mad(struct ib_mad_agent *mad_agent, 
		mad_send_wr->wr_id = mad_send_wr->send_wr.wr_id;

		mad_send_wr->wr_id = mad_send_wr->send_wr.wr_id;

		mad_send_wr->send_wr.next = NULL;

		mad_send_wr->send_wr.next = NULL;

		mad_send_wr->tid = send_wr->wr.ud.mad_hdr->tid;

		mad_send_wr->tid = send_wr->wr.ud.mad_hdr->tid;

		mad_send_wr->agent = mad_agent;

		mad_send_wr->mad_agent_priv = mad_agent_priv;

		/* Timeout will be updated after send completes */

		/* Timeout will be updated after send completes */

		mad_send_wr->timeout = msecs_to_jiffies(send_wr->wr.

		mad_send_wr->timeout = msecs_to_jiffies(send_wr->wr.

							ud.timeout_ms);

							ud.timeout_ms);
@@ -966,7 +965,7 @@ int ib_post_send_mad(struct ib_mad_agent *mad_agent, 
			      &mad_agent_priv->send_list);

			      &mad_agent_priv->send_list);

		spin_unlock_irqrestore(&mad_agent_priv->lock, flags);

		spin_unlock_irqrestore(&mad_agent_priv->lock, flags);





		ret = ib_send_mad(mad_agent_priv, mad_send_wr);

		ret = ib_send_mad(mad_send_wr);

		if (ret) {

		if (ret) {

			/* Fail send request */

			/* Fail send request */

			spin_lock_irqsave(&mad_agent_priv->lock, flags);

			spin_lock_irqsave(&mad_agent_priv->lock, flags);
@@ -1742,13 +1741,14 @@ static void adjust_timeout(struct ib_mad_agent_private *mad_agent_priv) 
	}

	}

}

}





static void wait_for_response(struct ib_mad_agent_private *mad_agent_priv,

static void wait_for_response(struct ib_mad_send_wr_private *mad_send_wr)

			      struct ib_mad_send_wr_private *mad_send_wr )

{

{

	struct ib_mad_agent_private *mad_agent_priv;

	struct ib_mad_send_wr_private *temp_mad_send_wr;

	struct ib_mad_send_wr_private *temp_mad_send_wr;

	struct list_head *list_item;

	struct list_head *list_item;

	unsigned long delay;

	unsigned long delay;





	mad_agent_priv = mad_send_wr->mad_agent_priv;

	list_del(&mad_send_wr->agent_list);

	list_del(&mad_send_wr->agent_list);





	delay = mad_send_wr->timeout;

	delay = mad_send_wr->timeout;
@@ -1781,9 +1781,7 @@ static void ib_mad_complete_send_wr(struct ib_mad_send_wr_private *mad_send_wr, 
	struct ib_mad_agent_private	*mad_agent_priv;

	struct ib_mad_agent_private	*mad_agent_priv;

	unsigned long			flags;

	unsigned long			flags;





	mad_agent_priv = container_of(mad_send_wr->agent,

	mad_agent_priv = mad_send_wr->mad_agent_priv;

				      struct ib_mad_agent_private, agent);



	spin_lock_irqsave(&mad_agent_priv->lock, flags);

	spin_lock_irqsave(&mad_agent_priv->lock, flags);

	if (mad_send_wc->status != IB_WC_SUCCESS &&

	if (mad_send_wc->status != IB_WC_SUCCESS &&

	    mad_send_wr->status == IB_WC_SUCCESS) {

	    mad_send_wr->status == IB_WC_SUCCESS) {
@@ -1794,7 +1792,7 @@ static void ib_mad_complete_send_wr(struct ib_mad_send_wr_private *mad_send_wr, 
	if (--mad_send_wr->refcount > 0) {

	if (--mad_send_wr->refcount > 0) {

		if (mad_send_wr->refcount == 1 && mad_send_wr->timeout &&

		if (mad_send_wr->refcount == 1 && mad_send_wr->timeout &&

		    mad_send_wr->status == IB_WC_SUCCESS) {

		    mad_send_wr->status == IB_WC_SUCCESS) {

			wait_for_response(mad_agent_priv, mad_send_wr);

			wait_for_response(mad_send_wr);

		}

		}

		spin_unlock_irqrestore(&mad_agent_priv->lock, flags);

		spin_unlock_irqrestore(&mad_agent_priv->lock, flags);

		return;

		return;

drivers/infiniband/core/mad_priv.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ 
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 * SOFTWARE.

 *

 *

 * $Id: mad_priv.h 1389 2004-12-27 22:56:47Z roland $

 * $Id: mad_priv.h 1980 2005-03-11 22:33:53Z sean.hefty $

 */

 */





#ifndef __IB_MAD_PRIV_H__

#ifndef __IB_MAD_PRIV_H__
@@ -116,7 +116,7 @@ struct ib_mad_snoop_private { 
struct ib_mad_send_wr_private {

struct ib_mad_send_wr_private {

	struct ib_mad_list_head mad_list;

	struct ib_mad_list_head mad_list;

	struct list_head agent_list;

	struct list_head agent_list;

	struct ib_mad_agent *agent;

	struct ib_mad_agent_private *mad_agent_priv;

	struct ib_send_wr send_wr;

	struct ib_send_wr send_wr;

	struct ib_sge sg_list[IB_MAD_SEND_REQ_MAX_SG];

	struct ib_sge sg_list[IB_MAD_SEND_REQ_MAX_SG];

	u64 wr_id;			/* client WR ID */

	u64 wr_id;			/* client WR ID */