mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

rtnetlink & bonding: change args got get_tx_queues 

Change get_tx_queues, drop unsused arg/return value real_tx_queues,
and use return by value (with error) rather than call by reference.

Probably bonding should just change to LLTX and the whole get_tx_queues
API could disappear!

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2012-04-10 18:34:43 +00:00 committed by David S. Miller
parent 302846e3a6
commit efacb309b5
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/bonding/bond_main.c
View File

@ -4820,12 +4820,9 @@ static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
return 0;
}
static int bond_get_tx_queues(struct net *net, struct nlattr *tb[],
unsigned int *num_queues,
unsigned int *real_num_queues)
static int bond_get_tx_queues(struct net *net, const struct nlattr *tb[])
{
*num_queues = tx_queues;
return 0;
return tx_queues;
}
static struct rtnl_link_ops bond_link_ops __read_mostly = {

5
include/net/rtnetlink.h
View File

@ -75,9 +75,8 @@ struct rtnl_link_ops {
size_t (*get_xstats_size)(const struct net_device *dev);
int (*fill_xstats)(struct sk_buff *skb,
const struct net_device *dev);
int (*get_tx_queues)(struct net *net, struct nlattr *tb[],
unsigned int *tx_queues,
unsigned int *real_tx_queues);
int (*get_tx_queues)(struct net *net,
const struct nlattr *tb[]);
};
extern int __rtnl_link_register(struct rtnl_link_ops *ops);

8
net/core/rtnetlink.c
View File

@ -1640,14 +1640,14 @@ struct net_device *rtnl_create_link(struct net *src_net, struct net *net,
int err;
struct net_device *dev;
unsigned int num_queues = 1;
unsigned int real_num_queues = 1;
if (ops->get_tx_queues) {
err = ops->get_tx_queues(src_net, tb, &num_queues,
&real_num_queues);
if (err)
err = ops->get_tx_queues(src_net, tb);
if (err < 0)
goto err;
num_queues = err;
}
err = -ENOMEM;
dev = alloc_netdev_mq(ops->priv_size, ifname, ops->setup, num_queues);
if (!dev)