Commit 2fa3ee93 authored by Jonathan Toppins's avatar Jonathan Toppins Committed by Jakub Kicinski

bonding: cleanup bond_create

Setting RLB_NULL_INDEX is not needed as this is done in bond_alb_initialize
which is called by bond_open.

Also reduce the number of rtnl_unlock calls by just using the standard
goto cleanup path.
Signed-off-by: default avatarJonathan Toppins <jtoppins@redhat.com>
Acked-by: default avatarJay Vosburgh <jay.vosburgh@canonical.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2bff369b
...@@ -6218,45 +6218,33 @@ int bond_create(struct net *net, const char *name) ...@@ -6218,45 +6218,33 @@ int bond_create(struct net *net, const char *name)
{ {
struct net_device *bond_dev; struct net_device *bond_dev;
struct bonding *bond; struct bonding *bond;
struct alb_bond_info *bond_info; int res = -ENOMEM;
int res;
rtnl_lock(); rtnl_lock();
bond_dev = alloc_netdev_mq(sizeof(struct bonding), bond_dev = alloc_netdev_mq(sizeof(struct bonding),
name ? name : "bond%d", NET_NAME_UNKNOWN, name ? name : "bond%d", NET_NAME_UNKNOWN,
bond_setup, tx_queues); bond_setup, tx_queues);
if (!bond_dev) { if (!bond_dev)
pr_err("%s: eek! can't alloc netdev!\n", name); goto out;
rtnl_unlock();
return -ENOMEM;
}
/*
* Initialize rx_hashtbl_used_head to RLB_NULL_INDEX.
* It is set to 0 by default which is wrong.
*/
bond = netdev_priv(bond_dev); bond = netdev_priv(bond_dev);
bond_info = &(BOND_ALB_INFO(bond));
bond_info->rx_hashtbl_used_head = RLB_NULL_INDEX;
dev_net_set(bond_dev, net); dev_net_set(bond_dev, net);
bond_dev->rtnl_link_ops = &bond_link_ops; bond_dev->rtnl_link_ops = &bond_link_ops;
res = register_netdevice(bond_dev); res = register_netdevice(bond_dev);
if (res < 0) { if (res < 0) {
free_netdev(bond_dev); free_netdev(bond_dev);
rtnl_unlock(); goto out;
return res;
} }
netif_carrier_off(bond_dev); netif_carrier_off(bond_dev);
bond_work_init_all(bond); bond_work_init_all(bond);
out:
rtnl_unlock(); rtnl_unlock();
return 0; return res;
} }
static int __net_init bond_net_init(struct net *net) static int __net_init bond_net_init(struct net *net)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment