diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2012-04-10 18:34:43 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-13 13:31:00 -0400 |
| commit | efacb309b50073a79ae604949a31509cd8b507ab (patch) | |
| tree | 98fa69062e8e0cbaecbe069f9fef18f1917e1e65 | |
| parent | 302846e3a692131a99b462078fe232ca2927b9d3 (diff) | |
| download | linux-3.10-efacb309b50073a79ae604949a31509cd8b507ab.tar.gz linux-3.10-efacb309b50073a79ae604949a31509cd8b507ab.tar.bz2 linux-3.10-efacb309b50073a79ae604949a31509cd8b507ab.zip | |
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>
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 7 | ||||
| -rw-r--r-- | include/net/rtnetlink.h | 5 | ||||
| -rw-r--r-- | net/core/rtnetlink.c | 8 |
3 files changed, 8 insertions, 12 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 62d2409bb29..53ee6a0a368 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -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 = { diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h index 37029390197..58243739212 100644 --- a/include/net/rtnetlink.h +++ b/include/net/rtnetlink.h @@ -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); diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 545a969672a..4a0d8cfff2a 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -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) |