luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bond: Simplify bond_create.

Browse Source 
Stop calling dev_get_by_name to see if the bond device already
exists.  register_netdevice already does that.

Stop calling bond_deinit if register_netdevice fails as bond_uninit
is guaranteed to be called if bond_init succeeds.

Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric W. Biederman 2009-10-29 14:18:23 +00:00 committed by David S. Miller
parent 6151b3d435
commit 30c15ba993
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5089,14 +5089,6 @@ int bond_create(const char *name)
int res;
rtnl_lock();
/* Check to see if the bond already exists. */
/* FIXME: pass netns from caller */
if (name && __dev_get_by_name(&init_net, name)) {
pr_err(DRV_NAME ": cannot add bond %s; already exists\n",
name);
res = -EEXIST;
goto out_rtnl;
}
bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",
bond_setup);
@ -5104,7 +5096,7 @@ int bond_create(const char *name)
pr_err(DRV_NAME ": %s: eek! can't alloc netdev!\n",
name);
res = -ENOMEM;
goto out_rtnl;
goto out;
}
if (!name) {
@ -5114,19 +5106,13 @@ int bond_create(const char *name)
}
res = register_netdevice(bond_dev);
if (res < 0)
goto out_bond;
rtnl_unlock();
return 0;
out_bond:
bond_deinit(bond_dev);
out_netdev:
free_netdev(bond_dev);
out_rtnl:
out:
rtnl_unlock();
return res;
out_netdev:
free_netdev(bond_dev);
goto out;
}
static int __init bonding_init(void)