Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3208b20 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

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: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a3f060c

drivers/net/bonding/bond_alb.c

+52 −30
Original line number Diff line number Diff line
@@ -950,22 +950,22 @@ static void alb_send_lp_vid(struct slave *slave, u8 mac_addr[], 
	dev_queue_xmit(skb);

}



static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[],

				      bool strict_match)

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 bonding *bond = bond_get_bond_by_slave(slave);

	struct net_device *upper;

	struct list_head *iter;

	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;



	/* send untagged */

	alb_send_lp_vid(slave, mac_addr, 0, 0);



	/* loop through all devices and see if we need to send a packet

	 * 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,
@@ -991,7 +991,29 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_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 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);



	/* loop through all devices and see if we need to send a packet

	 * for that device.

	 */

	rcu_read_lock();

	netdev_walk_all_upper_dev_rcu(bond->dev, alb_upper_dev_walk, &data);

	rcu_read_unlock();

}

drivers/net/bonding/bond_main.c

+9 −8
Original line number Diff line number Diff line
@@ -2270,22 +2270,23 @@ static void bond_mii_monitor(struct work_struct *work) 
	}

}



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)) {

	if (netdev_walk_all_upper_dev_rcu(bond->dev, bond_upper_dev_walk, &ip))

		ret = true;

			break;

		}

	}

	rcu_read_unlock();



	return ret;