From e8c6953712d8fc67c3781263e3670767b7388768 Mon Sep 17 00:00:00 2001 From: Shlomo Pongratz Date: Mon, 13 Aug 2012 14:39:50 +0000 Subject: [PATCH] --- yaml --- r: 321775 b: refs/heads/master c: 6c723a68c661008adf415ee90efe5f737e928ce0 h: refs/heads/master i: 321773: 665eb205e8803785bff548d8c495a705ed2bdb3f 321771: 1f3799f70f4f5d464143b8079dbd09c71863d7d0 321767: 5d6087c983611bae5aa29ea137d1146e3ffceb2d 321759: f724436b2e8aa7e608343db0d2e89058ace6582a v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ef523abbd275..0986c7b6195f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa16ebed31f336e41970f3f0ea9e8279f6be2d27 +refs/heads/master: 6c723a68c661008adf415ee90efe5f737e928ce0 diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c index 97920b77a5d0..3e2085a3ee47 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -1052,7 +1052,7 @@ void ipoib_neigh_free(struct ipoib_neigh *neigh) for (n = rcu_dereference_protected(*np, lockdep_is_held(&ntbl->rwlock)); n != NULL; - n = rcu_dereference_protected(neigh->hnext, + n = rcu_dereference_protected(*np, lockdep_is_held(&ntbl->rwlock))) { if (n == neigh) { /* found */