[openib-general] RE: [PATCH] rdma_cm oops: rdma_destroy_id

[Roland Dreier]

I just put the patch below into my git tree (which I am planning to
merge upstream when 2.6.17 opens).  Let me know if I screwed up
adapting the patch to those sources...

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index f68f892..45c973a 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -535,17 +535,6 @@ static int cma_notify_user(struct rdma_i
 	return id_priv->id.event_handler(&id_priv->id, &event);
 }
 
-static void cma_cancel_addr(struct rdma_id_private *id_priv)
-{
-	switch (id_priv->id.device->node_type) {
-	case IB_NODE_CA:
-		rdma_addr_cancel(&id_priv->id.route.addr.dev_addr);
-		break;
-	default:
-		break;
-	}
-}
-
 static void cma_cancel_route(struct rdma_id_private *id_priv)
 {
 	switch (id_priv->id.device->node_type) {
@@ -600,7 +589,7 @@ static void cma_cancel_operation(struct 
 {
 	switch (state) {
 	case CMA_ADDR_QUERY:
-		cma_cancel_addr(id_priv);
+		rdma_addr_cancel(&id_priv->id.route.addr.dev_addr);
 		break;
 	case CMA_ROUTE_QUERY:
 		cma_cancel_route(id_priv);