From 8e8f13edd6abb259153be4b2ea6875166aea5b5f Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 17 Nov 2009 06:45:04 -0800
Subject: [PATCH] --- yaml --- r: 168764 b: refs/heads/master c:
 6b863d1d3239eff0f45c2e6e672f5b56db828db0 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/8021q/vlan.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c886052a222a..c9b65b632f2f 100644
--- 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
index 8836575f9d79..a29c5ab5815c 100644
--- 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;
 }