From e11375b34fb0f0da40713835fed2d07a5767dff7 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 30 Nov 2005 10:01:13 -0800 Subject: [PATCH] --- yaml --- r: 17053 b: refs/heads/master c: de1bb1a64c29bae4f5330c70bd1dc6a62954c9f4 h: refs/heads/master i: 17051: 570c13fb575c79649f62a545a0774e6177a7c088 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/cm.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 23530cbaf869..b0317d9ed082 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 227eca83690da7dcbd698d3268e29402e0571723 +refs/heads/master: de1bb1a64c29bae4f5330c70bd1dc6a62954c9f4 diff --git a/trunk/drivers/infiniband/core/cm.c b/trunk/drivers/infiniband/core/cm.c index 1fe21865d1f2..3a611fe5497e 100644 --- a/trunk/drivers/infiniband/core/cm.c +++ b/trunk/drivers/infiniband/core/cm.c @@ -308,10 +308,11 @@ static int cm_alloc_id(struct cm_id_private *cm_id_priv) { unsigned long flags; int ret; + static int next_id; do { spin_lock_irqsave(&cm.lock, flags); - ret = idr_get_new_above(&cm.local_id_table, cm_id_priv, 1, + ret = idr_get_new_above(&cm.local_id_table, cm_id_priv, next_id++, (__force int *) &cm_id_priv->id.local_id); spin_unlock_irqrestore(&cm.lock, flags); } while( (ret == -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) );