openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtnl: simplify error return path in rtnl_create_link() 

There is only one possible error path which reaches the err label, so
return ERR_PTR(-ENOMEM) directly if alloc_netdev_mqs() fails. This also
allows to omit the err variable.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tobias Klauser 2017-02-20 16:32:06 +01:00 committed by David S. Miller
parent 017b29c38c
commit d1892e4ec9
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/core/rtnetlink.c
View File

@ -2358,7 +2358,6 @@ struct net_device *rtnl_create_link(struct net *net,
const char *ifname, unsigned char name_assign_type, const char *ifname, unsigned char name_assign_type,
const struct rtnl_link_ops *ops, struct nlattr *tb[]) const struct rtnl_link_ops *ops, struct nlattr *tb[])
{ {
int err;
struct net_device *dev; struct net_device *dev;
unsigned int num_tx_queues = 1; unsigned int num_tx_queues = 1;
unsigned int num_rx_queues = 1; unsigned int num_rx_queues = 1;
@ -2373,11 +2372,10 @@ struct net_device *rtnl_create_link(struct net *net,
else if (ops->get_num_rx_queues) else if (ops->get_num_rx_queues)
num_rx_queues = ops->get_num_rx_queues(); num_rx_queues = ops->get_num_rx_queues();
err = -ENOMEM;
dev = alloc_netdev_mqs(ops->priv_size, ifname, name_assign_type, dev = alloc_netdev_mqs(ops->priv_size, ifname, name_assign_type,
ops->setup, num_tx_queues, num_rx_queues); ops->setup, num_tx_queues, num_rx_queues);
if (!dev) if (!dev)
goto err; return ERR_PTR(-ENOMEM);
dev_net_set(dev, net); dev_net_set(dev, net);
dev->rtnl_link_ops = ops; dev->rtnl_link_ops = ops;
@ -2403,9 +2401,6 @@ struct net_device *rtnl_create_link(struct net *net,
dev_set_group(dev, nla_get_u32(tb[IFLA_GROUP])); dev_set_group(dev, nla_get_u32(tb[IFLA_GROUP]));
return dev; return dev;
err:
return ERR_PTR(err);
} }
EXPORT_SYMBOL(rtnl_create_link); EXPORT_SYMBOL(rtnl_create_link);