aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Sokolovsky <vlad@mellanox.co.il>2007-12-07 20:32:03 -0800
committerRoland Dreier <rolandd@cisco.com>2008-01-25 14:15:31 -0800
commit45d9478da106c749203056f56e94d0e370dfac87 (patch)
tree72cb4a06f5c5db9a74de080cf9bd688a36f3848b
parentb61d92d8ae6aa13b17d1c31e69d123879cec2ee2 (diff)
downloadmrst-s0i3-test-45d9478da106c749203056f56e94d0e370dfac87.tar.gz
mrst-s0i3-test-45d9478da106c749203056f56e94d0e370dfac87.tar.xz
mrst-s0i3-test-45d9478da106c749203056f56e94d0e370dfac87.zip
RDMA/cma: Reenable device removal on passive side
Enable conn_id remove on the passive side after connection establishment. This corrects an issue where the IB driver can't be unloaded after running applications over RDS. The 'dev_remove' counter does not reach 0 for established connections on the passive side. This problem is limited to device removal, and only occurs on the passive side if there are established connections. Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.co.il> Reviewed-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r--drivers/infiniband/core/cma.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 5a80e74731c..312ec74f3d1 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1122,8 +1122,10 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
cm_id->cm_handler = cma_ib_handler;
ret = conn_id->id.event_handler(&conn_id->id, &event);
- if (!ret)
+ if (!ret) {
+ cma_enable_remove(conn_id);
goto out;
+ }
/* Destroy the CM ID by returning a non-zero value. */
conn_id->cm_id.ib = NULL;