net: bonding: Flip to the new dev walk API

Convert alb_send_learning_packets and bond_has_this_ip to use the new
netdev_walk_all_upper_dev_rcu API. In both cases this is just a code
conversion; no functional change is intended.

v2
- removed typecast of data and simplified bond_upper_dev_walk

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 551f0f8dead3945cf1516aeff01afe6c74117072..c80b023092dde89f6b361e3879e06d70a9d3ad6f 100644 (file)
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -950,13 +950,61 @@ static void alb_send_lp_vid(struct slave *slave, u8 mac_addr[],
        dev_queue_xmit(skb);
 }
 
+struct alb_walk_data {
+       struct bonding *bond;
+       struct slave *slave;
+       u8 *mac_addr;
+       bool strict_match;
+};
+
+static int alb_upper_dev_walk(struct net_device *upper, void *_data)
+{
+       struct alb_walk_data *data = _data;
+       bool strict_match = data->strict_match;
+       struct bonding *bond = data->bond;
+       struct slave *slave = data->slave;
+       u8 *mac_addr = data->mac_addr;
+       struct bond_vlan_tag *tags;
+
+       if (is_vlan_dev(upper) && vlan_get_encap_level(upper) == 0) {
+               if (strict_match &&
+                   ether_addr_equal_64bits(mac_addr,
+                                           upper->dev_addr)) {
+                       alb_send_lp_vid(slave, mac_addr,
+                                       vlan_dev_vlan_proto(upper),
+                                       vlan_dev_vlan_id(upper));
+               } else if (!strict_match) {
+                       alb_send_lp_vid(slave, upper->dev_addr,
+                                       vlan_dev_vlan_proto(upper),
+                                       vlan_dev_vlan_id(upper));
+               }
+       }
+
+       /* If this is a macvlan device, then only send updates
+        * when strict_match is turned off.
+        */
+       if (netif_is_macvlan(upper) && !strict_match) {
+               tags = bond_verify_device_path(bond->dev, upper, 0);
+               if (IS_ERR_OR_NULL(tags))
+                       BUG();
+               alb_send_lp_vid(slave, upper->dev_addr,
+                               tags[0].vlan_proto, tags[0].vlan_id);
+               kfree(tags);
+       }
+
+       return 0;
+}
+
 static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[],
                                      bool strict_match)
 {
        struct bonding *bond = bond_get_bond_by_slave(slave);
-       struct net_device *upper;
-       struct list_head *iter;
-       struct bond_vlan_tag *tags;
+       struct alb_walk_data data = {
+               .strict_match = strict_match,
+               .mac_addr = mac_addr,
+               .slave = slave,
+               .bond = bond,
+       };
 
        /* send untagged */
        alb_send_lp_vid(slave, mac_addr, 0, 0);
@@ -965,33 +1013,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[],
         * for that device.
         */
        rcu_read_lock();
-       netdev_for_each_all_upper_dev_rcu(bond->dev, upper, iter) {
-               if (is_vlan_dev(upper) && vlan_get_encap_level(upper) == 0) {
-                       if (strict_match &&
-                           ether_addr_equal_64bits(mac_addr,
-                                                   upper->dev_addr)) {
-                               alb_send_lp_vid(slave, mac_addr,
-                                               vlan_dev_vlan_proto(upper),
-                                               vlan_dev_vlan_id(upper));
-                       } else if (!strict_match) {
-                               alb_send_lp_vid(slave, upper->dev_addr,
-                                               vlan_dev_vlan_proto(upper),
-                                               vlan_dev_vlan_id(upper));
-                       }
-               }
-
-               /* If this is a macvlan device, then only send updates
-                * when strict_match is turned off.
-                */
-               if (netif_is_macvlan(upper) && !strict_match) {
-                       tags = bond_verify_device_path(bond->dev, upper, 0);
-                       if (IS_ERR_OR_NULL(tags))
-                               BUG();
-                       alb_send_lp_vid(slave, upper->dev_addr,
-                                       tags[0].vlan_proto, tags[0].vlan_id);
-                       kfree(tags);
-               }
-       }
+       netdev_walk_all_upper_dev_rcu(bond->dev, alb_upper_dev_walk, &data);
        rcu_read_unlock();
 }
 

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 5fa36ebc06409aeed7d1477d9775ffd7460ecc6f..c9944d86d0457beea1adf29b218a284892892d28 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2270,22 +2270,23 @@ re_arm:
        }
 }
 
+static int bond_upper_dev_walk(struct net_device *upper, void *data)
+{
+       __be32 ip = *((__be32 *)data);
+
+       return ip == bond_confirm_addr(upper, 0, ip);
+}
+
 static bool bond_has_this_ip(struct bonding *bond, __be32 ip)
 {
-       struct net_device *upper;
-       struct list_head *iter;
        bool ret = false;
 
        if (ip == bond_confirm_addr(bond->dev, 0, ip))
                return true;
 
        rcu_read_lock();
-       netdev_for_each_all_upper_dev_rcu(bond->dev, upper, iter) {
-               if (ip == bond_confirm_addr(upper, 0, ip)) {
-                       ret = true;
-                       break;
-               }
-       }
+       if (netdev_walk_all_upper_dev_rcu(bond->dev, bond_upper_dev_walk, &ip))
+               ret = true;
        rcu_read_unlock();
 
        return ret;