aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_options.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2014-07-15 06:56:53 -0700
committerDavid S. Miller <davem@davemloft.net>2014-07-15 17:49:41 -0700
commite965f8049460569bab12fe7bb5381bb2279712e2 (patch)
tree2ec33b91922c261f24e56f8715c491a1e295330c /drivers/net/bonding/bond_options.c
parentMerge tag 'linux-can-next-for-3.17-20140715' of git://gitorious.org/linux-can/linux-can-next (diff)
downloadlinux-dev-e965f8049460569bab12fe7bb5381bb2279712e2.tar.xz
linux-dev-e965f8049460569bab12fe7bb5381bb2279712e2.zip
bonding: get rid of bond_option_active_slave_get()
Only keep bond_option_active_slave_get_rcu() helper. bond_fill_info() uses a new bond_option_active_slave_get_ifindex() helper. Signed-off-by: Eric Dumazet <edumazet@google.com> Acked-by: Veaceslav Falico <vfalico@gmail.com> Reviewed-by: Nikolay Aleksandrov <nikolay@redhat.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.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 540e0167bf24..b26271fd7b09 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -704,11 +704,6 @@ struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond)
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);
-}
-
static int bond_option_active_slave_set(struct bonding *bond,
const struct bond_opt_value *newval)
{