From 5121b72a0e3d0dc9c5eea527433dead12e859a5a Mon Sep 17 00:00:00 2001 From: Eli Cohen Date: Wed, 5 Apr 2006 15:59:34 +0300 Subject: [PATCH] --- yaml --- r: 25702 b: refs/heads/master c: a30bb96c6f5aca6513e4dbd94962da03d14b20a9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2e1772d49264..d35d5ae6f7c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abf45dbb5b256dab439ca3b6b71191ecfddf9cb6 +refs/heads/master: a30bb96c6f5aca6513e4dbd94962da03d14b20a9 diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c index 5bf7e263454b..996c6e16a46d 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -346,14 +346,15 @@ void ipoib_flush_paths(struct net_device *dev) list_for_each_entry(path, &remove_list, list) rb_erase(&path->rb_node, &priv->path_tree); - spin_unlock_irqrestore(&priv->lock, flags); - list_for_each_entry_safe(path, tp, &remove_list, list) { if (path->query) ib_sa_cancel_query(path->query_id, path->query); + spin_unlock_irqrestore(&priv->lock, flags); wait_for_completion(&path->done); path_free(dev, path); + spin_lock_irqsave(&priv->lock, flags); } + spin_unlock_irqrestore(&priv->lock, flags); } static void path_rec_completion(int status,