hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jiri Pirko 2012-07-20 02:28:47 +00:00 committed by David S. Miller
parent ee6ae1a1d5
commit d40156aa5e
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4845,17 +4845,19 @@ static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
return 0; return 0;
} }
static int bond_get_tx_queues(struct net *net, struct nlattr *tb[]) static unsigned int bond_get_num_tx_queues(void)
{ {
return tx_queues; return tx_queues;
} }
static struct rtnl_link_ops bond_link_ops __read_mostly = { static struct rtnl_link_ops bond_link_ops __read_mostly = {
.kind = "bond", .kind = "bond",
.priv_size = sizeof(struct bonding), .priv_size = sizeof(struct bonding),
.setup = bond_setup, .setup = bond_setup,
.validate = bond_validate, .validate = bond_validate,
.get_tx_queues = bond_get_tx_queues, .get_num_tx_queues = bond_get_num_tx_queues,
.get_num_rx_queues = bond_get_num_tx_queues, /* Use the same number
as for TX queues */
}; };
/* Create a new bond based on the specified name and bonding parameters. /* Create a new bond based on the specified name and bonding parameters.

10
include/net/rtnetlink.h
View File

@ -44,8 +44,10 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
* @get_xstats_size: Function to calculate required room for dumping device * @get_xstats_size: Function to calculate required room for dumping device
* specific statistics * specific statistics
* @fill_xstats: Function to dump device specific statistics * @fill_xstats: Function to dump device specific statistics
* @get_tx_queues: Function to determine number of transmit queues to create when * @get_num_tx_queues: Function to determine number of transmit queues
* creating a new device. * to create when creating a new device.
* @get_num_rx_queues: Function to determine number of receive queues
* to create when creating a new device.
*/ */
struct rtnl_link_ops { struct rtnl_link_ops {
struct list_head list; struct list_head list;
@ -77,8 +79,8 @@ struct rtnl_link_ops {
size_t (*get_xstats_size)(const struct net_device *dev); size_t (*get_xstats_size)(const struct net_device *dev);
int (*fill_xstats)(struct sk_buff *skb, int (*fill_xstats)(struct sk_buff *skb,
const struct net_device *dev); const struct net_device *dev);
int (*get_tx_queues)(struct net *net, unsigned int (*get_num_tx_queues)(void);
struct nlattr *tb[]); unsigned int (*get_num_rx_queues)(void);
}; };
extern int __rtnl_link_register(struct rtnl_link_ops *ops); extern int __rtnl_link_register(struct rtnl_link_ops *ops);

16
net/core/rtnetlink.c
View File

@ -1624,17 +1624,17 @@ struct net_device *rtnl_create_link(struct net *src_net, struct net *net,
{ {
int err; int err;
struct net_device *dev; struct net_device *dev;
unsigned int num_queues = 1; unsigned int num_tx_queues = 1;
unsigned int num_rx_queues = 1;
if (ops->get_tx_queues) { if (ops->get_num_tx_queues)
err = ops->get_tx_queues(src_net, tb); num_tx_queues = ops->get_num_tx_queues();
if (err < 0) if (ops->get_num_rx_queues)
goto err; num_rx_queues = ops->get_num_rx_queues();
num_queues = err;
}
err = -ENOMEM; err = -ENOMEM;
dev = alloc_netdev_mq(ops->priv_size, ifname, ops->setup, num_queues); dev = alloc_netdev_mqs(ops->priv_size, ifname, ops->setup,
num_tx_queues, num_rx_queues);
if (!dev) if (!dev)
goto err; goto err;