Commit 432c55ff authored by Christoph Lameter's avatar Christoph Lameter Committed by Doug Ledford
Browse files

IB/IPoIB: Move multicast specific code out of ipoib_main.c 



Code cleanup to move multicast specific code that checks for
a sendonly join to ipoib_multicast.c. This allows the removal
of the export of __ipoib_mcast_find().

Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 5a0e81f6

drivers/infiniband/ulp/ipoib/ipoib.h

+2 −1
Original line number Diff line number Diff line
@@ -549,7 +549,8 @@ 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);

void ipoib_mcast_remove_list(struct net_device *dev, struct list_head *remove_list);

struct ipoib_mcast *__ipoib_mcast_find(struct net_device *dev, void *mgid);

void ipoib_check_and_add_mcast_sendonly(struct ipoib_dev_priv *priv, u8 *mgid,

				struct list_head *remove_list);



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_main.c

+1 −12
Original line number Diff line number Diff line
@@ -1150,7 +1150,6 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv) 
	unsigned long flags;

	int i;

	LIST_HEAD(remove_list);

	struct ipoib_mcast *mcast;

	struct net_device *dev = priv->dev;



	if (test_bit(IPOIB_STOP_NEIGH_GC, &priv->flags))
@@ -1179,18 +1178,8 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv) 
							  lockdep_is_held(&priv->lock))) != NULL) {

			/* was the neigh idle for two GC periods */

			if (time_after(neigh_obsolete, neigh->alive)) {

				u8 *mgid = neigh->daddr + 4;



				/* Is this multicast ? */

				if (*mgid == 0xff) {

					mcast = __ipoib_mcast_find(dev, mgid);



					if (mcast && test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {

						list_del(&mcast->list);

						rb_erase(&mcast->rb_node, &priv->multicast_tree);

						list_add_tail(&mcast->list, &remove_list);

					}

				}

				ipoib_check_and_add_mcast_sendonly(priv, neigh->daddr + 4, &remove_list);



				rcu_assign_pointer(*np,

						   rcu_dereference_protected(neigh->hnext,

drivers/infiniband/ulp/ipoib/ipoib_multicast.c

+20 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static struct ipoib_mcast *ipoib_mcast_alloc(struct net_device *dev, 
	return mcast;

}



struct ipoib_mcast *__ipoib_mcast_find(struct net_device *dev, void *mgid)

static struct ipoib_mcast *__ipoib_mcast_find(struct net_device *dev, void *mgid)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct rb_node *n = priv->multicast_tree.rb_node;
@@ -704,6 +704,25 @@ static int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast) 
	return 0;

}



/*

 * Check if the multicast group is sendonly. If so remove it from the maps

 * and add to the remove list

 */

void ipoib_check_and_add_mcast_sendonly(struct ipoib_dev_priv *priv, u8 *mgid,

				struct list_head *remove_list)

{

	/* Is this multicast ? */

	if (*mgid == 0xff) {

		struct ipoib_mcast *mcast = __ipoib_mcast_find(priv->dev, mgid);



		if (mcast && test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {

			list_del(&mcast->list);

			rb_erase(&mcast->rb_node, &priv->multicast_tree);

			list_add_tail(&mcast->list, remove_list);

		}

	}

}



void ipoib_mcast_remove_list(struct net_device *dev, struct list_head *remove_list)

{

	struct ipoib_mcast *mcast, *tmcast;

CRA Git | Maintained and supported by SUSTech CRA and CCSE