diff options
| -rw-r--r-- | drivers/net/bonding/bonding.h | 4 | ||||
| -rw-r--r-- | include/linux/netdevice.h | 1 | ||||
| -rw-r--r-- | net/core/dev.c | 21 |
3 files changed, 26 insertions, 0 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 8283cbdec50a..8f0d6d0c383b 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h | |||
| @@ -101,6 +101,10 @@ | |||
| 101 | netdev_adjacent_get_private(bond_slave_list(bond)->prev) : \ | 101 | netdev_adjacent_get_private(bond_slave_list(bond)->prev) : \ |
| 102 | NULL) | 102 | NULL) |
| 103 | 103 | ||
| 104 | /* Caller must have rcu_read_lock */ | ||
| 105 | #define bond_first_slave_rcu(bond) \ | ||
| 106 | netdev_lower_get_first_private_rcu(bond->dev) | ||
| 107 | |||
| 104 | #define bond_is_first_slave(bond, pos) (pos == bond_first_slave(bond)) | 108 | #define bond_is_first_slave(bond, pos) (pos == bond_first_slave(bond)) |
| 105 | #define bond_is_last_slave(bond, pos) (pos == bond_last_slave(bond)) | 109 | #define bond_is_last_slave(bond, pos) (pos == bond_last_slave(bond)) |
| 106 | 110 | ||
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 5260d2eae2e6..2c74d20dad34 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -2907,6 +2907,7 @@ void *netdev_lower_get_next_private_rcu(struct net_device *dev, | |||
| 2907 | priv = netdev_lower_get_next_private_rcu(dev, &(iter))) | 2907 | priv = netdev_lower_get_next_private_rcu(dev, &(iter))) |
| 2908 | 2908 | ||
| 2909 | void *netdev_adjacent_get_private(struct list_head *adj_list); | 2909 | void *netdev_adjacent_get_private(struct list_head *adj_list); |
| 2910 | void *netdev_lower_get_first_private_rcu(struct net_device *dev); | ||
| 2910 | struct net_device *netdev_master_upper_dev_get(struct net_device *dev); | 2911 | struct net_device *netdev_master_upper_dev_get(struct net_device *dev); |
| 2911 | struct net_device *netdev_master_upper_dev_get_rcu(struct net_device *dev); | 2912 | struct net_device *netdev_master_upper_dev_get_rcu(struct net_device *dev); |
| 2912 | int netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev); | 2913 | int netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev); |
diff --git a/net/core/dev.c b/net/core/dev.c index c95d664b2b42..9d4369ece679 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -4544,6 +4544,27 @@ void *netdev_lower_get_next_private_rcu(struct net_device *dev, | |||
| 4544 | EXPORT_SYMBOL(netdev_lower_get_next_private_rcu); | 4544 | EXPORT_SYMBOL(netdev_lower_get_next_private_rcu); |
| 4545 | 4545 | ||
| 4546 | /** | 4546 | /** |
| 4547 | * netdev_lower_get_first_private_rcu - Get the first ->private from the | ||
| 4548 | * lower neighbour list, RCU | ||
| 4549 | * variant | ||
| 4550 | * @dev: device | ||
| 4551 | * | ||
| 4552 | * Gets the first netdev_adjacent->private from the dev's lower neighbour | ||
| 4553 | * list. The caller must hold RCU read lock. | ||
| 4554 | */ | ||
| 4555 | void *netdev_lower_get_first_private_rcu(struct net_device *dev) | ||
| 4556 | { | ||
| 4557 | struct netdev_adjacent *lower; | ||
| 4558 | |||
| 4559 | lower = list_first_or_null_rcu(&dev->adj_list.lower, | ||
| 4560 | struct netdev_adjacent, list); | ||
| 4561 | if (lower) | ||
| 4562 | return lower->private; | ||
| 4563 | return NULL; | ||
| 4564 | } | ||
| 4565 | EXPORT_SYMBOL(netdev_lower_get_first_private_rcu); | ||
| 4566 | |||
| 4567 | /** | ||
| 4547 | * netdev_master_upper_dev_get_rcu - Get master upper device | 4568 | * netdev_master_upper_dev_get_rcu - Get master upper device |
| 4548 | * @dev: device | 4569 | * @dev: device |
| 4549 | * | 4570 | * |
