diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-12-11 13:10:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-12-11 13:10:40 +0100 |
| commit | 6643aab30f88e2929bcc401a9ae39bf6f1c0b61d (patch) | |
| tree | 72c43e9d7287aef9b8d9699491038edc1929f1f2 /net/netlink/af_netlink.h | |
| parent | 8fb9dcbdc3619741c10c573199d804161c34c89a (diff) | |
| parent | 045169816b31b10faed984b01c390db1b32ee4c1 (diff) | |
| download | talos-op-linux-6643aab30f88e2929bcc401a9ae39bf6f1c0b61d.tar.gz talos-op-linux-6643aab30f88e2929bcc401a9ae39bf6f1c0b61d.zip | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/netlink/af_netlink.h')
| -rw-r--r-- | net/netlink/af_netlink.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netlink/af_netlink.h b/net/netlink/af_netlink.h index 3cfd6cc60504..4fdb38318977 100644 --- 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) @@ -33,6 +34,7 @@ struct netlink_sock { struct rhash_head node; struct rcu_head rcu; + struct work_struct work; }; static inline struct netlink_sock *nlk_sk(struct sock *sk) |
