aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_main.c
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2012-07-19 22:28:47 -0400
committerDavid S. Miller <davem@davemloft.net>2012-07-20 14:06:59 -0400
commitd40156aa5ecbd51fed932ed4813df82b56e5ff4d (patch)
tree34b9d6b16ab469bde1998a20c9b26b9388578bd9 /drivers/net/bonding/bond_main.c
parentee6ae1a1d58c70fc864bc777a36be56b0880ebff (diff)
rtnl: allow to specify different num for rx and tx queue count
Also cut out unused function parameters and possible err in return value. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
-rw-r--r--drivers/net/bonding/bond_main.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 3960b1b26178..f41ddc2d48be 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4845,17 +4845,19 @@ static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
4845 return 0; 4845 return 0;
4846} 4846}
4847 4847
4848static int bond_get_tx_queues(struct net *net, struct nlattr *tb[]) 4848static unsigned int bond_get_num_tx_queues(void)
4849{ 4849{
4850 return tx_queues; 4850 return tx_queues;
4851} 4851}
4852 4852
4853static struct rtnl_link_ops bond_link_ops __read_mostly = { 4853static struct rtnl_link_ops bond_link_ops __read_mostly = {
4854 .kind = "bond", 4854 .kind = "bond",
4855 .priv_size = sizeof(struct bonding), 4855 .priv_size = sizeof(struct bonding),
4856 .setup = bond_setup, 4856 .setup = bond_setup,
4857 .validate = bond_validate, 4857 .validate = bond_validate,
4858 .get_tx_queues = bond_get_tx_queues, 4858 .get_num_tx_queues = bond_get_num_tx_queues,
4859 .get_num_rx_queues = bond_get_num_tx_queues, /* Use the same number
4860 as for TX queues */
4859}; 4861};
4860 4862
4861/* Create a new bond based on the specified name and bonding parameters. 4863/* Create a new bond based on the specified name and bonding parameters.