Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -3858,6 +3858,8 @@ int netdev_walk_all_upper_dev_rcu(struct net_device *dev,
|
||||
bool netdev_has_upper_dev_all_rcu(struct net_device *dev,
|
||||
struct net_device *upper_dev);
|
||||
|
||||
bool netdev_has_any_upper_dev(struct net_device *dev);
|
||||
|
||||
void *netdev_lower_get_next_private(struct net_device *dev,
|
||||
struct list_head **iter);
|
||||
void *netdev_lower_get_next_private_rcu(struct net_device *dev,
|
||||
|
Reference in New Issue
Block a user