* [PATCH net-next] netlink: cleanup tap related functions
@ 2013-12-30 18:49 Stephen Hemminger
2013-12-30 18:58 ` Johannes Berg
2014-01-02 4:44 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Hemminger @ 2013-12-30 18:49 UTC (permalink / raw)
To: David Miller, Johannes Berg; +Cc: netdev
Cleanups in netlink_tap code
* remove unused function netlink_clear_multicast_users
* make local function static
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
include/linux/netlink.h | 2 --
net/netlink/af_netlink.c | 18 +-----------------
2 files changed, 1 insertion(+), 19 deletions(-)
--- a/include/linux/netlink.h 2013-12-24 15:14:54.530174175 -0800
+++ b/include/linux/netlink.h 2013-12-24 15:16:01.721271435 -0800
@@ -62,7 +62,6 @@ extern void netlink_kernel_release(struc
extern int __netlink_change_ngroups(struct sock *sk, unsigned int groups);
extern int netlink_change_ngroups(struct sock *sk, unsigned int groups);
extern void __netlink_clear_multicast_users(struct sock *sk, unsigned int group);
-extern void netlink_clear_multicast_users(struct sock *sk, unsigned int group);
extern void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err);
extern int netlink_has_listeners(struct sock *sk, unsigned int group);
extern struct sk_buff *netlink_alloc_skb(struct sock *ssk, unsigned int size,
@@ -168,7 +167,6 @@ struct netlink_tap {
};
extern int netlink_add_tap(struct netlink_tap *nt);
-extern int __netlink_remove_tap(struct netlink_tap *nt);
extern int netlink_remove_tap(struct netlink_tap *nt);
#endif /* __LINUX_NETLINK_H */
--- a/net/netlink/af_netlink.c 2013-12-24 15:14:54.530174175 -0800
+++ b/net/netlink/af_netlink.c 2013-12-24 15:16:01.721271435 -0800
@@ -131,7 +131,7 @@ int netlink_add_tap(struct netlink_tap *
}
EXPORT_SYMBOL_GPL(netlink_add_tap);
-int __netlink_remove_tap(struct netlink_tap *nt)
+static int __netlink_remove_tap(struct netlink_tap *nt)
{
bool found = false;
struct netlink_tap *tmp;
@@ -155,7 +155,6 @@ out:
return found ? 0 : -ENODEV;
}
-EXPORT_SYMBOL_GPL(__netlink_remove_tap);
int netlink_remove_tap(struct netlink_tap *nt)
{
@@ -2535,21 +2534,6 @@ void __netlink_clear_multicast_users(str
netlink_update_socket_mc(nlk_sk(sk), group, 0);
}
-/**
- * netlink_clear_multicast_users - kick off multicast listeners
- *
- * This function removes all listeners from the given group.
- * @ksk: The kernel netlink socket, as returned by
- * netlink_kernel_create().
- * @group: The multicast group to clear.
- */
-void netlink_clear_multicast_users(struct sock *ksk, unsigned int group)
-{
- netlink_table_grab();
- __netlink_clear_multicast_users(ksk, group);
- netlink_table_ungrab();
-}
-
struct nlmsghdr *
__nlmsg_put(struct sk_buff *skb, u32 portid, u32 seq, int type, int len, int flags)
{
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] netlink: cleanup tap related functions
2013-12-30 18:49 [PATCH net-next] netlink: cleanup tap related functions Stephen Hemminger
@ 2013-12-30 18:58 ` Johannes Berg
2014-01-02 4:44 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Johannes Berg @ 2013-12-30 18:58 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: David Miller, netdev
On Mon, 2013-12-30 at 10:49 -0800, Stephen Hemminger wrote:
> Cleanups in netlink_tap code
> * remove unused function netlink_clear_multicast_users
> * make local function static
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Looks good to me.
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
johannes
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] netlink: cleanup tap related functions
2013-12-30 18:49 [PATCH net-next] netlink: cleanup tap related functions Stephen Hemminger
2013-12-30 18:58 ` Johannes Berg
@ 2014-01-02 4:44 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2014-01-02 4:44 UTC (permalink / raw)
To: stephen; +Cc: johannes, netdev
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 30 Dec 2013 10:49:22 -0800
> Cleanups in netlink_tap code
> * remove unused function netlink_clear_multicast_users
> * make local function static
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-02 4:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-30 18:49 [PATCH net-next] netlink: cleanup tap related functions Stephen Hemminger
2013-12-30 18:58 ` Johannes Berg
2014-01-02 4:44 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).