---

yaml --- r: 198596 b: refs/heads/master c: f16d3d5 h: refs/heads/master v: v3
git-mirror · May 25, 2010 · b8648d0 · b8648d0
1 parent 6c58f69
commit b8648d0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 556ae19110f2de5ace4733e0c19e5fa01fad08b3
+refs/heads/master: f16d3d57486cd079b29ae7a6c3b31c90e69c9c44
diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c
@@ -634,11 +634,18 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
 
 	err = register_netdevice(dev);
 	if (err < 0)
-		return err;
+		goto destroy_port;
 
 	list_add_tail(&vlan->list, &port->vlans);
 	netif_stacked_transfer_operstate(lowerdev, dev);
+
 	return 0;
+
+destroy_port:
+	if (list_empty(&port->vlans))
+		macvlan_port_destroy(lowerdev);
+
+	return err;
 }
 EXPORT_SYMBOL_GPL(macvlan_common_newlink);