Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[mirror_ubuntu-artful-kernel.git] / drivers / infiniband / core / roce_gid_mgmt.c

diff --git a/drivers/infiniband/core/roce_gid_mgmt.c b/drivers/infiniband/core/roce_gid_mgmt.c
index c86ddcea76757a9660fa2e3a3b25ecdb5e324cec..0621f4455732d83496b1dde0201912985f1ff8de 100644 (file)
--- a/drivers/infiniband/core/roce_gid_mgmt.c
+++ b/drivers/infiniband/core/roce_gid_mgmt.c
@@ -434,6 +434,26 @@ static void callback_for_addr_gid_device_scan(struct ib_device *device,
                          &parsed->gid_attr);
 }
 
+struct upper_list {
+       struct list_head list;
+       struct net_device *upper;
+};
+
+static int netdev_upper_walk(struct net_device *upper, void *data)
+{
+       struct upper_list *entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
+       struct list_head *upper_list = data;
+
+       if (!entry)
+               return 0;
+
+       list_add_tail(&entry->list, upper_list);
+       dev_hold(upper);
+       entry->upper = upper;
+
+       return 0;
+}
+
 static void handle_netdev_upper(struct ib_device *ib_dev, u8 port,
                                void *cookie,
                                void (*handle_netdev)(struct ib_device *ib_dev,
@@ -441,28 +461,12 @@ static void handle_netdev_upper(struct ib_device *ib_dev, u8 port,
                                                      struct net_device *ndev))
 {
        struct net_device *ndev = (struct net_device *)cookie;
-       struct upper_list {
-               struct list_head list;
-               struct net_device *upper;
-       };
-       struct net_device *upper;
-       struct list_head *iter;
        struct upper_list *upper_iter;
        struct upper_list *upper_temp;
        LIST_HEAD(upper_list);
 
        rcu_read_lock();
-       netdev_for_each_all_upper_dev_rcu(ndev, upper, iter) {
-               struct upper_list *entry = kmalloc(sizeof(*entry),
-                                                  GFP_ATOMIC);
-
-               if (!entry)
-                       continue;
-
-               list_add_tail(&entry->list, &upper_list);
-               dev_hold(upper);
-               entry->upper = upper;
-       }
+       netdev_walk_all_upper_dev_rcu(ndev, netdev_upper_walk, &upper_list);
        rcu_read_unlock();
 
        handle_netdev(ib_dev, port, ndev);