Commit b6191aee authored by Paul Gortmaker's avatar Paul Gortmaker Committed by David S. Miller

net/core: make sock_diag.c explicitly non-modular

The Makefile currently controlling compilation of this code lists
it under "obj-y" ...meaning that it currently is not being built as
a module by anyone.

Lets remove the modular code that is essentially orphaned, so that
when reading the driver there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.  We can
change to one of the other priority initcalls (subsys?) at any later
date, if desired.

We can't remove module.h since the file uses other module related
stuff even though it is not modular itself.

We move the information from the MODULE_LICENSE tag to the top of the
file, since that information is not captured anywhere else.  The
MODULE_ALIAS_NET_PF_PROTO becomes a no-op in the non modular case, so
it is removed.

Cc: "David S. Miller" <>
Cc: Eric Dumazet <>
Cc: Nicolas Dichtel <>
Cc: Daniel Borkmann <>
Cc: Alexei Starovoitov <>
Cc: Craig Gallek <>
Signed-off-by: default avatarPaul Gortmaker <>
Signed-off-by: default avatarDavid S. Miller <>
parent 4d886d65
/* 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)
return register_pernet_subsys(&diag_net_ops);
static void __exit sock_diag_exit(void)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment