Commit 403863e9 authored by Jiri Pirko's avatar Jiri Pirko Committed by Paolo Abeni
Browse files

netlink: introduce typedef for filter function 



Make the code using filter function a bit nicer by consolidating the
filter function arguments using typedef.

Suggested-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent a7311324

drivers/connector/connector.c

+2 −3
Original line number Diff line number Diff line
@@ -59,8 +59,7 @@ static int cn_already_initialized; 
 * both, or if both are zero then the group is looked up and sent there.

 */

int cn_netlink_send_mult(struct cn_msg *msg, u16 len, u32 portid, u32 __group,

	gfp_t gfp_mask,

	int (*filter)(struct sock *dsk, struct sk_buff *skb, void *data),

			 gfp_t gfp_mask, netlink_filter_fn filter,

			 void *filter_data)

{

	struct cn_callback_entry *__cbq;

include/linux/connector.h

+1 −2
Original line number Diff line number Diff line
@@ -100,8 +100,7 @@ void cn_del_callback(const struct cb_id *id); 
 */

int cn_netlink_send_mult(struct cn_msg *msg, u16 len, u32 portid,

			 u32 group, gfp_t gfp_mask,

			 int (*filter)(struct sock *dsk, struct sk_buff *skb,

				       void *data),

			 netlink_filter_fn filter,

			 void *filter_data);



/**

include/linux/netlink.h

+4 −2
Original line number Diff line number Diff line
@@ -228,10 +228,12 @@ bool netlink_strict_get_check(struct sk_buff *skb); 
int netlink_unicast(struct sock *ssk, struct sk_buff *skb, __u32 portid, int nonblock);

int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, __u32 portid,

		      __u32 group, gfp_t allocation);



typedef int (*netlink_filter_fn)(struct sock *dsk, struct sk_buff *skb, void *data);



int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb,

			       __u32 portid, __u32 group, gfp_t allocation,

			       int (*filter)(struct sock *dsk,

					     struct sk_buff *skb, void *data),

			       netlink_filter_fn filter,

			       void *filter_data);

int netlink_set_err(struct sock *ssk, __u32 portid, __u32 group, int code);

int netlink_register_notifier(struct notifier_block *nb);

net/netlink/af_netlink.c

+1 −2
Original line number Diff line number Diff line
@@ -1519,8 +1519,7 @@ static void do_one_broadcast(struct sock *sk, 
int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb,

			       u32 portid,

			       u32 group, gfp_t allocation,

			       int (*filter)(struct sock *dsk,

					     struct sk_buff *skb, void *data),

			       netlink_filter_fn filter,

			       void *filter_data)

{

	struct net *net = sock_net(ssk);