diff --git a/[refs] b/[refs] index 3ce9dc6717b5..0e915fe25d76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 715a588f420936ecdb813c4fcd40dff7a16b1638 +refs/heads/master: 9ab1ffa8775d9c677b1301cccce8a7d91e5163d0 diff --git a/trunk/drivers/infiniband/core/iwcm.c b/trunk/drivers/infiniband/core/iwcm.c index 54faa033d89e..cf797d7aea09 100644 --- a/trunk/drivers/infiniband/core/iwcm.c +++ b/trunk/drivers/infiniband/core/iwcm.c @@ -147,8 +147,9 @@ static int copy_private_data(struct iw_cm_event *event) } /* - * Release a reference on cm_id. If the last reference is being removed - * and iw_destroy_cm_id is waiting, wake up the waiting thread. + * Release a reference on cm_id. If the last reference is being + * released, enable the waiting thread (in iw_destroy_cm_id) to + * get woken up, and return 1 if a thread is already waiting. */ static int iwcm_deref_id(struct iwcm_id_private *cm_id_priv) {