diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2012-04-10 14:34:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-13 13:31:00 -0400 |
| commit | efacb309b50073a79ae604949a31509cd8b507ab (patch) | |
| tree | 98fa69062e8e0cbaecbe069f9fef18f1917e1e65 /net | |
| parent | 302846e3a692131a99b462078fe232ca2927b9d3 (diff) | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/rtnetlink.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 545a969672ab..4a0d8cfff2a0 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, | |||
| 1640 | int err; | 1640 | int err; |
| 1641 | struct net_device *dev; | 1641 | struct net_device *dev; |
| 1642 | unsigned int num_queues = 1; | 1642 | unsigned int num_queues = 1; |
| 1643 | unsigned int real_num_queues = 1; | ||
| 1644 | 1643 | ||
| 1645 | if (ops->get_tx_queues) { | 1644 | if (ops->get_tx_queues) { |
| 1646 | err = ops->get_tx_queues(src_net, tb, &num_queues, | 1645 | err = ops->get_tx_queues(src_net, tb); |
| 1647 | &real_num_queues); | 1646 | if (err < 0) |
| 1648 | if (err) | ||
| 1649 | goto err; | 1647 | goto err; |
| 1648 | num_queues = err; | ||
| 1650 | } | 1649 | } |
| 1650 | |||
| 1651 | err = -ENOMEM; | 1651 | err = -ENOMEM; |
| 1652 | dev = alloc_netdev_mq(ops->priv_size, ifname, ops->setup, num_queues); | 1652 | dev = alloc_netdev_mq(ops->priv_size, ifname, ops->setup, num_queues); |
| 1653 | if (!dev) | 1653 | if (!dev) |