aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/core/dev.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index ee0d6286f934..464c22b6261a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4865,8 +4865,7 @@ struct netdev_adjacent {
4865 struct rcu_head rcu; 4865 struct rcu_head rcu;
4866}; 4866};
4867 4867
4868static struct netdev_adjacent *__netdev_find_adj(struct net_device *dev, 4868static struct netdev_adjacent *__netdev_find_adj(struct net_device *adj_dev,
4869 struct net_device *adj_dev,
4870 struct list_head *adj_list) 4869 struct list_head *adj_list)
4871{ 4870{
4872 struct netdev_adjacent *adj; 4871 struct netdev_adjacent *adj;
@@ -4892,7 +4891,7 @@ bool netdev_has_upper_dev(struct net_device *dev,
4892{ 4891{
4893 ASSERT_RTNL(); 4892 ASSERT_RTNL();
4894 4893
4895 return __netdev_find_adj(dev, upper_dev, &dev->all_adj_list.upper); 4894 return __netdev_find_adj(upper_dev, &dev->all_adj_list.upper);
4896} 4895}
4897EXPORT_SYMBOL(netdev_has_upper_dev); 4896EXPORT_SYMBOL(netdev_has_upper_dev);
4898 4897
@@ -5154,7 +5153,7 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev,
5154 struct netdev_adjacent *adj; 5153 struct netdev_adjacent *adj;
5155 int ret; 5154 int ret;
5156 5155
5157 adj = __netdev_find_adj(dev, adj_dev, dev_list); 5156 adj = __netdev_find_adj(adj_dev, dev_list);
5158 5157
5159 if (adj) { 5158 if (adj) {
5160 adj->ref_nr++; 5159 adj->ref_nr++;
@@ -5210,7 +5209,7 @@ static void __netdev_adjacent_dev_remove(struct net_device *dev,
5210{ 5209{
5211 struct netdev_adjacent *adj; 5210 struct netdev_adjacent *adj;
5212 5211
5213 adj = __netdev_find_adj(dev, adj_dev, dev_list); 5212 adj = __netdev_find_adj(adj_dev, dev_list);
5214 5213
5215 if (!adj) { 5214 if (!adj) {
5216 pr_err("tried to remove device %s from %s\n", 5215 pr_err("tried to remove device %s from %s\n",
@@ -5331,10 +5330,10 @@ static int __netdev_upper_dev_link(struct net_device *dev,
5331 return -EBUSY; 5330 return -EBUSY;
5332 5331
5333 /* To prevent loops, check if dev is not upper device to upper_dev. */ 5332 /* To prevent loops, check if dev is not upper device to upper_dev. */
5334 if (__netdev_find_adj(upper_dev, dev, &upper_dev->all_adj_list.upper)) 5333 if (__netdev_find_adj(dev, &upper_dev->all_adj_list.upper))
5335 return -EBUSY; 5334 return -EBUSY;
5336 5335
5337 if (__netdev_find_adj(dev, upper_dev, &dev->adj_list.upper)) 5336 if (__netdev_find_adj(upper_dev, &dev->adj_list.upper))
5338 return -EEXIST; 5337 return -EEXIST;
5339 5338
5340 if (master && netdev_master_upper_dev_get(dev)) 5339 if (master && netdev_master_upper_dev_get(dev))
@@ -5612,7 +5611,7 @@ void *netdev_lower_dev_get_private(struct net_device *dev,
5612 5611
5613 if (!lower_dev) 5612 if (!lower_dev)
5614 return NULL; 5613 return NULL;
5615 lower = __netdev_find_adj(dev, lower_dev, &dev->adj_list.lower); 5614 lower = __netdev_find_adj(lower_dev, &dev->adj_list.lower);
5616 if (!lower) 5615 if (!lower)
5617 return NULL; 5616 return NULL;
5618 5617