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

Commit e0e79c8e authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

IB/ipoib: Flip to new dev walk API 



Convert ipoib_get_net_dev_match_addr to the new upper device walk API.
This is just a code conversion; no functional change is intended.

v2
- removed typecast of data

Signed-off-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 453d3932

drivers/infiniband/ulp/ipoib/ipoib_main.c

+25 −12
Original line number Diff line number Diff line
@@ -292,6 +292,25 @@ static struct net_device *ipoib_get_master_net_dev(struct net_device *dev) 
	return dev;

}



struct ipoib_walk_data {

	const struct sockaddr *addr;

	struct net_device *result;

};



static int ipoib_upper_walk(struct net_device *upper, void *_data)

{

	struct ipoib_walk_data *data = _data;

	int ret = 0;



	if (ipoib_is_dev_match_addr_rcu(data->addr, upper)) {

		dev_hold(upper);

		data->result = upper;

		ret = 1;

	}



	return ret;

}



/**

 * Find a net_device matching the given address, which is an upper device of

 * the given net_device.
@@ -304,27 +323,21 @@ static struct net_device *ipoib_get_master_net_dev(struct net_device *dev) 
static struct net_device *ipoib_get_net_dev_match_addr(

		const struct sockaddr *addr, struct net_device *dev)

{

	struct net_device *upper,

			  *result = NULL;

	struct list_head *iter;

	struct ipoib_walk_data data = {

		.addr = addr,

	};



	rcu_read_lock();

	if (ipoib_is_dev_match_addr_rcu(addr, dev)) {

		dev_hold(dev);

		result = dev;

		data.result = dev;

		goto out;

	}



	netdev_for_each_all_upper_dev_rcu(dev, upper, iter) {

		if (ipoib_is_dev_match_addr_rcu(addr, upper)) {

			dev_hold(upper);

			result = upper;

			break;

		}

	}

	netdev_walk_all_upper_dev_rcu(dev, ipoib_upper_walk, &data);

out:

	rcu_read_unlock();

	return result;

	return data.result;

}



/* returns the number of IPoIB netdevs on top a given ipoib device matching a