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

Commit 9eae554c authored by Roland Dreier's avatar Roland Dreier
Browse files

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: default avatarRoland Dreier <rolandd@cisco.com>
parent d0de1362

drivers/infiniband/ulp/ipoib/ipoib.h

+0 −2
Original line number Diff line number Diff line
@@ -486,8 +486,6 @@ void ipoib_path_iter_read(struct ipoib_path_iter *iter, 


int ipoib_mcast_attach(struct net_device *dev, u16 mlid,

		       union ib_gid *mgid, int set_qkey);

int ipoib_mcast_detach(struct net_device *dev, u16 mlid,

		       union ib_gid *mgid);



int ipoib_init_qp(struct net_device *dev);

int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca);

drivers/infiniband/ulp/ipoib/ipoib_multicast.c

+3 −3
Original line number Diff line number Diff line
@@ -627,10 +627,10 @@ static int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast) 
				IPOIB_GID_ARG(mcast->mcmember.mgid));



		/* Remove ourselves from the multicast group */

		ret = ipoib_mcast_detach(dev, be16_to_cpu(mcast->mcmember.mlid),

					 &mcast->mcmember.mgid);

		ret = ib_detach_mcast(priv->qp, &mcast->mcmember.mgid,

				      be16_to_cpu(mcast->mcmember.mlid));

		if (ret)

			ipoib_warn(priv, "ipoib_mcast_detach failed (result = %d)\n", ret);

			ipoib_warn(priv, "ib_detach_mcast failed (result = %d)\n", ret);

	}



	return 0;

drivers/infiniband/ulp/ipoib/ipoib_verbs.c

+0 −12
Original line number Diff line number Diff line
@@ -72,18 +72,6 @@ out: 
	return ret;

}



int ipoib_mcast_detach(struct net_device *dev, u16 mlid, union ib_gid *mgid)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	int ret;



	ret = ib_detach_mcast(priv->qp, mgid, mlid);

	if (ret)

		ipoib_warn(priv, "ib_detach_mcast failed (result = %d)\n", ret);



	return ret;

}



int ipoib_init_qp(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);