---

yaml --- r: 168764 b: refs/heads/master c: 6b863d1 h: refs/heads/master v: v3
git-mirror · Nov 17, 2009 · 8e8f13e · 8e8f13e
1 parent bb7c4d8
commit 8e8f13e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69c0cab120a85471054614418b447349caba22d7
+refs/heads/master: 6b863d1d3239eff0f45c2e6e672f5b56db828db0
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
@@ -281,8 +281,11 @@ int register_vlan_dev(struct net_device *dev)
 	if (ngrp)
 		vlan_gvrp_uninit_applicant(real_dev);
 out_free_group:
-	if (ngrp)
-		vlan_group_free(ngrp);
+	if (ngrp) {
+		hlist_del_rcu(&ngrp->hlist);
+		/* Free the group, after all cpu's are done. */
+		call_rcu(&ngrp->rcu, vlan_rcu_free);
+	}
 	return err;
 }