---

yaml --- r: 96065 b: refs/heads/master c: e340a90 h: refs/heads/master i: 96063: df9cb2c v: v3
git-mirror · May 5, 2008 · ceda2da · ceda2da
1 parent 431c5cb
commit ceda2da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c37aa90b0458d87342e0bb083f6bf7d113220d09
+refs/heads/master: e340a90e6e07bba6e6b3fc39dd5fa76f95579d7c
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
@@ -273,24 +273,24 @@ 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)
 		unregister_netdevice(dev);
  out:
 	rtnl_unlock();
 	return ret;
+
+out_free:
+	free_netdev(dev);
+	goto out;
 }
 
 int br_del_bridge(const char *name)