diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-05-04 17:58:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-04 17:58:07 -0700 |
| commit | e340a90e6e07bba6e6b3fc39dd5fa76f95579d7c (patch) | |
| tree | 68f1448c762d217bbed95c49b5da85c1151b278b /net | |
| parent | c37aa90b0458d87342e0bb083f6bf7d113220d09 (diff) | |
| download | linux-3.10-e340a90e6e07bba6e6b3fc39dd5fa76f95579d7c.tar.gz linux-3.10-e340a90e6e07bba6e6b3fc39dd5fa76f95579d7c.tar.bz2 linux-3.10-e340a90e6e07bba6e6b3fc39dd5fa76f95579d7c.zip | |
bridge: Consolidate error paths in br_add_bridge().
This actually had to be merged with the patch #1, but I decided not to
mix two changes in one patch.
There are already two calls to free_netdev() in there, so merge them
into one.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_if.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index bff0f5bb12b..c2397f503b0 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -273,17 +273,13 @@ int br_add_bridge(const char *name) rtnl_lock(); if (strchr(dev->name, '%')) { ret = dev_alloc_name(dev, dev->name); - if (ret < 0) { - free_netdev(dev); - goto out; - } + if (ret < 0) + goto out_free; } ret = register_netdevice(dev); - if (ret) { - free_netdev(dev); - goto out; - } + if (ret) + goto out_free; ret = br_sysfs_addbr(dev); if (ret) @@ -291,6 +287,10 @@ int br_add_bridge(const char *name) out: rtnl_unlock(); return ret; + +out_free: + free_netdev(dev); + goto out; } int br_del_bridge(const char *name) |