3 files changed, 8 insertions, 12 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 62d2409bb293..53ee6a0a3681 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 370293901971..58243739212c 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 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,
         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)