summaryrefslogtreecommitdiff
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@aristanetworks.com>2009-10-29 14:18:23 +0000
committerDavid S. Miller <davem@davemloft.net>2009-10-30 12:41:19 -0700
commit30c15ba9936a17d743f90eb3e2f6fa82acddc5f3 (patch)
treed9a9c6cf0df8ae3ab04111977a824c92ab634384 /drivers/net/bonding
parent6151b3d435feeeae7487032fcd5c8c7f281ba05c (diff)
downloadlinux-3.10-30c15ba9936a17d743f90eb3e2f6fa82acddc5f3.tar.gz
linux-3.10-30c15ba9936a17d743f90eb3e2f6fa82acddc5f3.tar.bz2
linux-3.10-30c15ba9936a17d743f90eb3e2f6fa82acddc5f3.zip
bond: Simplify bond_create.
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>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_main.c22
1 files changed, 4 insertions, 18 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index a58a60859da..17c9580068b 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -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;
+out:
rtnl_unlock();
- return 0;
-
-out_bond:
- bond_deinit(bond_dev);
+ return res;
out_netdev:
free_netdev(bond_dev);
-out_rtnl:
- rtnl_unlock();
- return res;
+ goto out;
}
static int __init bonding_init(void)