aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_multicast.c')
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_multicast.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 60b09f5cb347..fb3e4875a46d 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -361,7 +361,7 @@ static int ipoib_mcast_sendonly_join(struct ipoib_mcast *mcast)
361 361
362 init_completion(&mcast->done); 362 init_completion(&mcast->done);
363 363
364 ret = ib_sa_mcmember_rec_set(priv->ca, priv->port, &rec, 364 ret = ib_sa_mcmember_rec_set(&ipoib_sa_client, priv->ca, priv->port, &rec,
365 IB_SA_MCMEMBER_REC_MGID | 365 IB_SA_MCMEMBER_REC_MGID |
366 IB_SA_MCMEMBER_REC_PORT_GID | 366 IB_SA_MCMEMBER_REC_PORT_GID |
367 IB_SA_MCMEMBER_REC_PKEY | 367 IB_SA_MCMEMBER_REC_PKEY |
@@ -485,9 +485,9 @@ static void ipoib_mcast_join(struct net_device *dev, struct ipoib_mcast *mcast,
485 485
486 init_completion(&mcast->done); 486 init_completion(&mcast->done);
487 487
488 ret = ib_sa_mcmember_rec_set(priv->ca, priv->port, &rec, comp_mask, 488 ret = ib_sa_mcmember_rec_set(&ipoib_sa_client, priv->ca, priv->port,
489 mcast->backoff * 1000, GFP_ATOMIC, 489 &rec, comp_mask, mcast->backoff * 1000,
490 ipoib_mcast_join_complete, 490 GFP_ATOMIC, ipoib_mcast_join_complete,
491 mcast, &mcast->query); 491 mcast, &mcast->query);
492 492
493 if (ret < 0) { 493 if (ret < 0) {
@@ -528,7 +528,7 @@ void ipoib_mcast_join_task(void *dev_ptr)
528 priv->local_rate = attr.active_speed * 528 priv->local_rate = attr.active_speed *
529 ib_width_enum_to_int(attr.active_width); 529 ib_width_enum_to_int(attr.active_width);
530 } else 530 } else
531 ipoib_warn(priv, "ib_query_port failed\n"); 531 ipoib_warn(priv, "ib_query_port failed\n");
532 } 532 }
533 533
534 if (!priv->broadcast) { 534 if (!priv->broadcast) {
@@ -681,7 +681,7 @@ static int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast)
681 * Just make one shot at leaving and don't wait for a reply; 681 * Just make one shot at leaving and don't wait for a reply;
682 * if we fail, too bad. 682 * if we fail, too bad.
683 */ 683 */
684 ret = ib_sa_mcmember_rec_delete(priv->ca, priv->port, &rec, 684 ret = ib_sa_mcmember_rec_delete(&ipoib_sa_client, priv->ca, priv->port, &rec,
685 IB_SA_MCMEMBER_REC_MGID | 685 IB_SA_MCMEMBER_REC_MGID |
686 IB_SA_MCMEMBER_REC_PORT_GID | 686 IB_SA_MCMEMBER_REC_PORT_GID |
687 IB_SA_MCMEMBER_REC_PKEY | 687 IB_SA_MCMEMBER_REC_PKEY |