diff options
author | Veaceslav Falico <vfalico@gmail.com> | 2014-05-15 15:39:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-16 16:34:32 -0400 |
commit | ec0865a94991d1819d4f99866a2492af8df5c882 (patch) | |
tree | 8b2e1a5987776e063e8a7dc1431e65394a7eef76 /drivers/net/bonding/bond_options.c | |
parent | 267bed777a5f8a8f5acd50a9134c7341fc46d822 (diff) |
bonding: make USES_PRIMARY inline functions
Change the name a bit to better reflect its scope, and update some
comments. Two functions added - one which takes bond as a param and the
other which takes the mode.
CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_options.c')
-rw-r--r-- | drivers/net/bonding/bond_options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index 98c8801ddb67..dd7292fa4665 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c | |||
@@ -693,7 +693,7 @@ int bond_option_mode_set(struct bonding *bond, const struct bond_opt_value *newv | |||
693 | static struct net_device *__bond_option_active_slave_get(struct bonding *bond, | 693 | static struct net_device *__bond_option_active_slave_get(struct bonding *bond, |
694 | struct slave *slave) | 694 | struct slave *slave) |
695 | { | 695 | { |
696 | return USES_PRIMARY(bond->params.mode) && slave ? slave->dev : NULL; | 696 | return bond_uses_primary(bond) && slave ? slave->dev : NULL; |
697 | } | 697 | } |
698 | 698 | ||
699 | struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond) | 699 | struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond) |