diff options
author | Roland Dreier <rolandd@cisco.com> | 2008-07-15 02:48:50 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2008-07-15 02:48:50 -0400 |
commit | 9eae554c171e086c89ab83da2a2d3c8bf958fcb5 (patch) | |
tree | 52023c51bf3ad116e3506f20f7c90fd9a29661b3 /drivers/infiniband/ulp/ipoib/ipoib_multicast.c | |
parent | d0de13622d5ac658efe7c51521dbdbe0752aa3dd (diff) |
IPoIB: Get rid of ipoib_mcast_detach() wrapper
ipoib_mcast_detach() does nothing except call ib_detach_mcast(), so just
use the core API in the one place that does a multicast group detach.
add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-105 (-105)
function old new delta
ipoib_mcast_leave 357 319 -38
ipoib_mcast_detach 67 - -67
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index 55ebd950bf23..71add7a8d53c 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c | |||
@@ -627,10 +627,10 @@ static int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast) | |||
627 | IPOIB_GID_ARG(mcast->mcmember.mgid)); | 627 | IPOIB_GID_ARG(mcast->mcmember.mgid)); |
628 | 628 | ||
629 | /* Remove ourselves from the multicast group */ | 629 | /* Remove ourselves from the multicast group */ |
630 | ret = ipoib_mcast_detach(dev, be16_to_cpu(mcast->mcmember.mlid), | 630 | ret = ib_detach_mcast(priv->qp, &mcast->mcmember.mgid, |
631 | &mcast->mcmember.mgid); | 631 | be16_to_cpu(mcast->mcmember.mlid)); |
632 | if (ret) | 632 | if (ret) |
633 | ipoib_warn(priv, "ipoib_mcast_detach failed (result = %d)\n", ret); | 633 | ipoib_warn(priv, "ib_detach_mcast failed (result = %d)\n", ret); |
634 | } | 634 | } |
635 | 635 | ||
636 | return 0; | 636 | return 0; |