---

yaml --- r: 103256 b: refs/heads/master c: ce30500 h: refs/heads/master v: v3
git-mirror · Jul 6, 2008 · c6c921d · c6c921d
1 parent a88f34a
commit c6c921d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3ce0325f2bf1bb737cb8fc7c349ce8fefdd9e40
+refs/heads/master: ce305002e1c9b90c2c151ce18bab0b895dd55ae6
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
@@ -165,6 +165,8 @@ void unregister_vlan_dev(struct net_device *dev)
 
 	synchronize_net();
 
+	unregister_netdevice(dev);
+
 	/* If the group is now empty, kill off the group. */
 	if (grp->nr_vlans == 0) {
 		if (real_dev->features & NETIF_F_HW_VLAN_RX)
@@ -178,8 +180,6 @@ void unregister_vlan_dev(struct net_device *dev)
 
 	/* Get rid of the vlan's reference to real_dev */
 	dev_put(real_dev);
-
-	unregister_netdevice(dev);
 }
 
 static void vlan_transfer_operstate(const struct net_device *dev,