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

Commit 752d48b5 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

bonding: move active_slave getting into separate function 



Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 080a06e1

drivers/net/bonding/bond_options.c

+18 −0
Original line number Diff line number Diff line
@@ -57,6 +57,24 @@ int bond_option_mode_set(struct bonding *bond, int mode) 
	return 0;

}



static struct net_device *__bond_option_active_slave_get(struct bonding *bond,

							 struct slave *slave)

{

	return USES_PRIMARY(bond->params.mode) && slave ? slave->dev : NULL;

}



struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond)

{

	struct slave *slave = rcu_dereference(bond->curr_active_slave);



	return __bond_option_active_slave_get(bond, slave);

}



struct net_device *bond_option_active_slave_get(struct bonding *bond)

{

	return __bond_option_active_slave_get(bond, bond->curr_active_slave);

}



int bond_option_active_slave_set(struct bonding *bond,

				 struct net_device *slave_dev)

{

drivers/net/bonding/bond_sysfs.c

+4 −4
Original line number Diff line number Diff line
@@ -1219,13 +1219,13 @@ static ssize_t bonding_show_active_slave(struct device *d, 
					 char *buf)

{

	struct bonding *bond = to_bond(d);

	struct slave *curr;

	struct net_device *slave_dev;

	int count = 0;



	rcu_read_lock();

	curr = rcu_dereference(bond->curr_active_slave);

	if (USES_PRIMARY(bond->params.mode) && curr)

		count = sprintf(buf, "%s\n", curr->dev->name);

	slave_dev = bond_option_active_slave_get_rcu(bond);

	if (slave_dev)

		count = sprintf(buf, "%s\n", slave_dev->name);

	rcu_read_unlock();



	return count;

drivers/net/bonding/bonding.h

+2 −0
Original line number Diff line number Diff line
@@ -428,6 +428,8 @@ int bond_netlink_init(void); 
void bond_netlink_fini(void);

int bond_option_mode_set(struct bonding *bond, int mode);

int bond_option_active_slave_set(struct bonding *bond, struct net_device *slave_dev);

struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond);

struct net_device *bond_option_active_slave_get(struct bonding *bond);



struct bond_net {

	struct net *		net;	/* Associated network namespace */