Merge branch 'v4.4/topic/mm-kaslr-pax_usercopy' into linux-linaro-lsk-v4.4

[firefly-linux-kernel-4.4.55.git] / net / netlink / af_netlink.h

diff --git a/net/netlink/af_netlink.h b/net/netlink/af_netlink.h
index 14437d9b1965dcf3d3f085e4aba1f804bdc6f652..ea4600aea6b0bebeb42addbe92cd38164654df90 100644 (file)
--- a/net/netlink/af_netlink.h
+++ b/net/netlink/af_netlink.h
@@ -3,6 +3,7 @@
 
 #include <linux/rhashtable.h>
 #include <linux/atomic.h>
+#include <linux/workqueue.h>
 #include <net/sock.h>
 
 #define NLGRPSZ(x)     (ALIGN(x, sizeof(unsigned long) * 8) / 8)
@@ -44,15 +45,10 @@ struct netlink_sock {
        int                     (*netlink_bind)(struct net *net, int group);
        void                    (*netlink_unbind)(struct net *net, int group);
        struct module           *module;
-#ifdef CONFIG_NETLINK_MMAP
-       struct mutex            pg_vec_lock;
-       struct netlink_ring     rx_ring;
-       struct netlink_ring     tx_ring;
-       atomic_t                mapped;
-#endif /* CONFIG_NETLINK_MMAP */
 
        struct rhash_head       node;
        struct rcu_head         rcu;
+       struct work_struct      work;
 };
 
 static inline struct netlink_sock *nlk_sk(struct sock *sk)
@@ -60,15 +56,6 @@ static inline struct netlink_sock *nlk_sk(struct sock *sk)
        return container_of(sk, struct netlink_sock, sk);
 }
 
-static inline bool netlink_skb_is_mmaped(const struct sk_buff *skb)
-{
-#ifdef CONFIG_NETLINK_MMAP
-       return NETLINK_CB(skb).flags & NETLINK_SKB_MMAPED;
-#else
-       return false;
-#endif /* CONFIG_NETLINK_MMAP */
-}
-
 struct netlink_table {
        struct rhashtable       hash;
        struct hlist_head       mc_list;