bonding: correct the cleanup in bond_create()
This patch makes the cleanup in bond_create nicer :) Also now the forgotten free_netdev is called. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c047fcd245
commit
1363d9b135
|
@ -5158,16 +5158,15 @@ int bond_create(char *name, struct bond_params *params)
|
||||||
up_write(&bonding_rwsem);
|
up_write(&bonding_rwsem);
|
||||||
rtnl_unlock(); /* allows sysfs registration of net device */
|
rtnl_unlock(); /* allows sysfs registration of net device */
|
||||||
res = bond_create_sysfs_entry(netdev_priv(bond_dev));
|
res = bond_create_sysfs_entry(netdev_priv(bond_dev));
|
||||||
if (res < 0) {
|
if (res < 0)
|
||||||
rtnl_lock();
|
goto out_unreg;
|
||||||
down_write(&bonding_rwsem);
|
|
||||||
bond_deinit(bond_dev);
|
|
||||||
unregister_netdevice(bond_dev);
|
|
||||||
goto out_rtnl;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
out_unreg:
|
||||||
|
rtnl_lock();
|
||||||
|
down_write(&bonding_rwsem);
|
||||||
|
unregister_netdevice(bond_dev);
|
||||||
out_bond:
|
out_bond:
|
||||||
bond_deinit(bond_dev);
|
bond_deinit(bond_dev);
|
||||||
out_netdev:
|
out_netdev:
|
||||||
|
|
Loading…
Reference in New Issue