X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fnetlink%2Fgenetlink.c;h=d16929c9b4bc39b6f036c22a5365a7e7a49fa8c1;hb=b881502666783b2d9ca2fc7a056d0f773073a808;hp=150579a21469d664563dfcee8bdef5d3f0e355e1;hpb=95b00786f3b8fa99f53931361beeb4c10504ad87;p=~andy%2Flinux

diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 150579a2146..d16929c9b4b 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -230,10 +230,8 @@ static void genl_unregister_mc_groups(struct genl_family *family)
 {
 	struct genl_multicast_group *grp, *tmp;
 
-	genl_lock();
 	list_for_each_entry_safe(grp, tmp, &family->mcast_groups, list)
 		__genl_unregister_mc_group(family, grp);
-	genl_unlock();
 }
 
 /**
@@ -396,10 +394,10 @@ int genl_unregister_family(struct genl_family *family)
 {
 	struct genl_family *rc;
 
-	genl_unregister_mc_groups(family);
-
 	genl_lock();
 
+	genl_unregister_mc_groups(family);
+
 	list_for_each_entry(rc, genl_family_chain(family->id), family_list) {
 		if (family->id != rc->id || strcmp(rc->name, family->name))
 			continue;