From: Hal Rosenstock <halr@voltaire.com>
Date: Wed, 27 Jul 2005 18:45:30 +0000 (-0700)
Subject: [PATCH] IB: Simplify calling of list_del in MAD
X-Git-Tag: Ubuntu-5.0.0-8.9~55959^2~51
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dbf9227bd3dff71c3c2f540cc3e96098d2ab41e7;p=mirror_ubuntu-disco-kernel.git

[PATCH] IB: Simplify calling of list_del in MAD

Simplify calling of list_del.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 04f88d337388..e96ca278c90e 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -2188,7 +2188,6 @@ static int retry_send(struct ib_mad_send_wr_private *mad_send_wr)
 
 	if (!ret) {
 		mad_send_wr->refcount++;
-		list_del(&mad_send_wr->agent_list);
 		list_add_tail(&mad_send_wr->agent_list,
 			      &mad_send_wr->mad_agent_priv->send_list);
 	}
@@ -2223,10 +2222,10 @@ static void timeout_sends(void *data)
 			break;
 		}
 
+		list_del(&mad_send_wr->agent_list);
 		if (!retry_send(mad_send_wr))
 			continue;
 
-		list_del(&mad_send_wr->agent_list);
 		spin_unlock_irqrestore(&mad_agent_priv->lock, flags);
 
 		mad_send_wc.wr_id = mad_send_wr->wr_id;