diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-11-19 09:19:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-11-19 16:39:06 -0500 |
commit | 06fb555a273dc8ef0d876f4e864ad11cfcea63e0 (patch) | |
tree | 780b6e332c0411d67ad3e8428e4240bb54f60c33 | |
parent | 03ed3827463ffb7210c5ef6a1a6f64c776f9daec (diff) |
genetlink: remove genl_unregister_mc_group()
There are no users of this API remaining, and we'll soon
change group registration to be static (like ops are now)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/genetlink.h | 2 | ||||
-rw-r--r-- | net/netlink/genetlink.c | 23 |
2 files changed, 0 insertions, 25 deletions
diff --git a/include/net/genetlink.h b/include/net/genetlink.h index 9bd52a4c5e17..067569d1bc99 100644 --- a/include/net/genetlink.h +++ b/include/net/genetlink.h | |||
@@ -168,8 +168,6 @@ static inline int _genl_register_family_with_ops(struct genl_family *family, | |||
168 | int genl_unregister_family(struct genl_family *family); | 168 | int genl_unregister_family(struct genl_family *family); |
169 | int genl_register_mc_group(struct genl_family *family, | 169 | int genl_register_mc_group(struct genl_family *family, |
170 | struct genl_multicast_group *grp); | 170 | struct genl_multicast_group *grp); |
171 | void genl_unregister_mc_group(struct genl_family *family, | ||
172 | struct genl_multicast_group *grp); | ||
173 | void genl_notify(struct sk_buff *skb, struct net *net, u32 portid, | 171 | void genl_notify(struct sk_buff *skb, struct net *net, u32 portid, |
174 | u32 group, struct nlmsghdr *nlh, gfp_t flags); | 172 | u32 group, struct nlmsghdr *nlh, gfp_t flags); |
175 | 173 | ||
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index bee91a7527a5..6efb0e9036b5 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c | |||
@@ -265,29 +265,6 @@ static void __genl_unregister_mc_group(struct genl_family *family, | |||
265 | grp->family = NULL; | 265 | grp->family = NULL; |
266 | } | 266 | } |
267 | 267 | ||
268 | /** | ||
269 | * genl_unregister_mc_group - unregister a multicast group | ||
270 | * | ||
271 | * Unregisters the specified multicast group and notifies userspace | ||
272 | * about it. All current listeners on the group are removed. | ||
273 | * | ||
274 | * Note: It is not necessary to unregister all multicast groups before | ||
275 | * unregistering the family, unregistering the family will cause | ||
276 | * all assigned multicast groups to be unregistered automatically. | ||
277 | * | ||
278 | * @family: Generic netlink family the group belongs to. | ||
279 | * @grp: The group to unregister, must have been registered successfully | ||
280 | * previously. | ||
281 | */ | ||
282 | void genl_unregister_mc_group(struct genl_family *family, | ||
283 | struct genl_multicast_group *grp) | ||
284 | { | ||
285 | genl_lock_all(); | ||
286 | __genl_unregister_mc_group(family, grp); | ||
287 | genl_unlock_all(); | ||
288 | } | ||
289 | EXPORT_SYMBOL(genl_unregister_mc_group); | ||
290 | |||
291 | static void genl_unregister_mc_groups(struct genl_family *family) | 268 | static void genl_unregister_mc_groups(struct genl_family *family) |
292 | { | 269 | { |
293 | struct genl_multicast_group *grp, *tmp; | 270 | struct genl_multicast_group *grp, *tmp; |