From aca67a1cb362e51628f285ae303bf17da654ca74 Mon Sep 17 00:00:00 2001 From: Or Gerlitz Date: Tue, 29 Jan 2008 12:57:56 +0200 Subject: [PATCH] --- yaml --- r: 83242 b: refs/heads/master c: 7bc531dd883b955e6198c8e202161f22d2e8c472 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 25025a0cfc34..29953b127f1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bafff9741704959e99fb65a7327c017251019a19 +refs/heads/master: 7bc531dd883b955e6198c8e202161f22d2e8c472 diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c index 886a08cc7d4a..09f5371137a1 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -814,11 +814,9 @@ static void ipoib_neigh_cleanup(struct neighbour *n) struct ipoib_ah *ah = NULL; neigh = *to_ipoib_neigh(n); - if (neigh) { + if (neigh) priv = netdev_priv(neigh->dev); - ipoib_dbg(priv, "neigh_destructor for bonding device: %s\n", - n->dev->name); - } else + else return; ipoib_dbg(priv, "neigh_cleanup for %06x " IPOIB_GID_FMT "\n",