diff options
| author | Or Gerlitz <ogerlitz@voltaire.com> | 2006-07-24 10:42:00 +0300 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2006-07-24 09:18:07 -0700 |
| commit | 624d01f899f6bbd75fd06890f231e1f46555d376 (patch) | |
| tree | c2e6f4d31dd87c2d6883ff212a5d986f8bd1f642 /drivers/infiniband/ulp/ipoib/ipoib_multicast.c | |
| parent | 2527e681fd4fd4231c2e04f09d7b04d3cab8eefe (diff) | |
| download | lwn-624d01f899f6bbd75fd06890f231e1f46555d376.tar.gz lwn-624d01f899f6bbd75fd06890f231e1f46555d376.zip | |
IB/ipoib: Fix oops with ipoib_debug_mcast set
Need to set mcast->ah before debug code dereferences it.
Signed-off-by: Or Gerlitz <ogerlitz@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_multicast.c')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index ab40488182b3..b5e6a7be603d 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c @@ -264,6 +264,10 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast, if (!ah) { ipoib_warn(priv, "ib_address_create failed\n"); } else { + spin_lock_irq(&priv->lock); + mcast->ah = ah; + spin_unlock_irq(&priv->lock); + ipoib_dbg_mcast(priv, "MGID " IPOIB_GID_FMT " AV %p, LID 0x%04x, SL %d\n", IPOIB_GID_ARG(mcast->mcmember.mgid), @@ -271,10 +275,6 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast, be16_to_cpu(mcast->mcmember.mlid), mcast->mcmember.sl); } - - spin_lock_irq(&priv->lock); - mcast->ah = ah; - spin_unlock_irq(&priv->lock); } /* actually send any queued packets */ |