diff options
Diffstat (limited to 'net/netlink/genetlink.c')
| -rw-r--r-- | net/netlink/genetlink.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index 150579a21469..d16929c9b4bc 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) | |||
| 230 | { | 230 | { |
| 231 | struct genl_multicast_group *grp, *tmp; | 231 | struct genl_multicast_group *grp, *tmp; |
| 232 | 232 | ||
| 233 | genl_lock(); | ||
| 234 | list_for_each_entry_safe(grp, tmp, &family->mcast_groups, list) | 233 | list_for_each_entry_safe(grp, tmp, &family->mcast_groups, list) |
| 235 | __genl_unregister_mc_group(family, grp); | 234 | __genl_unregister_mc_group(family, grp); |
| 236 | genl_unlock(); | ||
| 237 | } | 235 | } |
| 238 | 236 | ||
| 239 | /** | 237 | /** |
| @@ -396,10 +394,10 @@ int genl_unregister_family(struct genl_family *family) | |||
| 396 | { | 394 | { |
| 397 | struct genl_family *rc; | 395 | struct genl_family *rc; |
| 398 | 396 | ||
| 399 | genl_unregister_mc_groups(family); | ||
| 400 | |||
| 401 | genl_lock(); | 397 | genl_lock(); |
| 402 | 398 | ||
| 399 | genl_unregister_mc_groups(family); | ||
| 400 | |||
| 403 | list_for_each_entry(rc, genl_family_chain(family->id), family_list) { | 401 | list_for_each_entry(rc, genl_family_chain(family->id), family_list) { |
| 404 | if (family->id != rc->id || strcmp(rc->name, family->name)) | 402 | if (family->id != rc->id || strcmp(rc->name, family->name)) |
| 405 | continue; | 403 | continue; |
