diff options
author | Mike Marshall <hubcap@omnibond.com> | 2015-11-16 18:58:57 +0300 |
---|---|---|
committer | Mike Marshall <hubcap@omnibond.com> | 2015-11-16 18:58:57 +0300 |
commit | a52079dad4718fa924ae81a939f8a665366f562b (patch) | |
tree | a9d6004f9bf1beff49cbfe0d5bf6edbf621b065d /net/core/sock_diag.c | |
parent | 24c8d0804be00da90af9efa8eb404bd7a3284ba9 (diff) | |
parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
download | linux-a52079dad4718fa924ae81a939f8a665366f562b.tar.xz |
Orangefs: Merge tag 'v4.4-rc1' into for-next
Linux 4.4-rc1
Diffstat (limited to 'net/core/sock_diag.c')
-rw-r--r-- | net/core/sock_diag.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c index 817622f3dbb7..0c1d58d43f67 100644 --- a/net/core/sock_diag.c +++ b/net/core/sock_diag.c @@ -1,3 +1,5 @@ +/* License: GPL */ + #include <linux/mutex.h> #include <linux/socket.h> #include <linux/skbuff.h> @@ -323,14 +325,4 @@ static int __init sock_diag_init(void) BUG_ON(!broadcast_wq); return register_pernet_subsys(&diag_net_ops); } - -static void __exit sock_diag_exit(void) -{ - unregister_pernet_subsys(&diag_net_ops); - destroy_workqueue(broadcast_wq); -} - -module_init(sock_diag_init); -module_exit(sock_diag_exit); -MODULE_LICENSE("GPL"); -MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_SOCK_DIAG); +device_initcall(sock_diag_init); |