|
@@ -292,6 +292,25 @@ static struct net_device *ipoib_get_master_net_dev(struct net_device *dev)
|
|
return 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
|
|
* Find a net_device matching the given address, which is an upper device of
|
|
* the given net_device.
|
|
* 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(
|
|
static struct net_device *ipoib_get_net_dev_match_addr(
|
|
const struct sockaddr *addr, struct net_device *dev)
|
|
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();
|
|
rcu_read_lock();
|
|
if (ipoib_is_dev_match_addr_rcu(addr, dev)) {
|
|
if (ipoib_is_dev_match_addr_rcu(addr, dev)) {
|
|
dev_hold(dev);
|
|
dev_hold(dev);
|
|
- result = dev;
|
|
|
|
|
|
+ data.result = dev;
|
|
goto out;
|
|
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:
|
|
out:
|
|
rcu_read_unlock();
|
|
rcu_read_unlock();
|
|
- return result;
|
|
|
|
|
|
+ return data.result;
|
|
}
|
|
}
|
|
|
|
|
|
/* returns the number of IPoIB netdevs on top a given ipoib device matching a
|
|
/* returns the number of IPoIB netdevs on top a given ipoib device matching a
|