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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 7f7b94f616a66c95a9349803cb2ff6ae59f060c9..4028e8eeba821e99fde750d9119067854d240294 100644 (file)
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -59,9 +59,8 @@ 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),
-       void *filter_data)
+                        gfp_t gfp_mask, netlink_filter_fn filter,
+                        void *filter_data)
 {
        struct cn_callback_entry *__cbq;
        unsigned int size;

diff --git a/include/linux/connector.h b/include/linux/connector.h
index cec2d99ae9021f194683e3d44d76859e7546f299..70bc1160f3d8dea00c5540d569425a3521b205e2 100644 (file)
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -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);
 
 /**

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index abe91ed6b9aa0d986a934b68206954fcdfe7c14c..1a4445bf2ab9acff630b3712453c8a6cdf8fc47c 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -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);

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 177126fb04842f1c5842b7de48c378eaa370843c..4ed8ffd58ff375f3fa9f262e6f3b4d1a1aaf2731 100644 (file)
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1519,8 +1519,7 @@ out:
 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);