Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de922487 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Roland Dreier
Browse files

IPoIB: reinitialize mcast structs' completions for every query 



Make sure mcast->done is initialized to uncompleted value before we
submit a new query, so that it's safe to wait on.

Signed-off-by: default avatarMichael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 5872a9fc

drivers/infiniband/ulp/ipoib/ipoib_multicast.c

+4 −2
Original line number Diff line number Diff line
@@ -135,8 +135,6 @@ static struct ipoib_mcast *ipoib_mcast_alloc(struct net_device *dev, 
	if (!mcast)

		return NULL;



	init_completion(&mcast->done);



	mcast->dev = dev;

	mcast->created = jiffies;

	mcast->backoff = 1;
@@ -350,6 +348,8 @@ static int ipoib_mcast_sendonly_join(struct ipoib_mcast *mcast) 
	rec.port_gid = priv->local_gid;

	rec.pkey     = cpu_to_be16(priv->pkey);



	init_completion(&mcast->done);



	ret = ib_sa_mcmember_rec_set(priv->ca, priv->port, &rec,

				     IB_SA_MCMEMBER_REC_MGID		|

				     IB_SA_MCMEMBER_REC_PORT_GID	|
@@ -469,6 +469,8 @@ static void ipoib_mcast_join(struct net_device *dev, struct ipoib_mcast *mcast, 
		rec.traffic_class = priv->broadcast->mcmember.traffic_class;

	}



	init_completion(&mcast->done);



	ret = ib_sa_mcmember_rec_set(priv->ca, priv->port, &rec, comp_mask,

				     mcast->backoff * 1000, GFP_ATOMIC,

				     ipoib_mcast_join_complete,