path: root/net/ipv4/gre_offload.c
diff options
authorPaul Gortmaker <>2014-01-15 11:19:55 -0500
committerDavid S. Miller <>2014-01-16 16:08:27 -0800
commitcf1722837246cdca199f7abfcd658bd4632c337b (patch)
treec0006d6d4cc55c762f88a2f218566e5295710e04 /net/ipv4/gre_offload.c
parentf088cbb8d8547a89af258a3223657f9a69b811e4 (diff)
net/ipv4: don't use module_init in non-modular gre_offload
Recent commit 438e38fadca2f6e57eeecc08326c8a95758594d4 ("gre_offload: statically build GRE offloading support") added new module_init/module_exit calls to the gre_offload.c file. The file is obj-y and can't be anything other than built-in. Currently it can never be built modular, so using module_init as an alias for __initcall can be somewhat misleading. Fix this up now, so that we can relocate module_init from init.h into module.h in the future. If we don't do this, we'd have to add module.h to obviously non-modular code, and that would be a worse thing. We also make the inclusion explicit. Note that direct use of __initcall is discouraged, vs. one of the priority categorized subgroups. As __initcall gets mapped onto device_initcall, our use of device_initcall directly in this change means that the runtime impact is zero -- it will remain at level 6 in initcall ordering. As for the module_exit, rather than replace it with __exitcall, we simply remove it, since it appears only UML does anything with those, and even for UML, there is no relevant cleanup to be done here. Cc: Eric Dumazet <> Signed-off-by: Paul Gortmaker <> Acked-by: Eric Dumazet <> Signed-off-by: David S. Miller <>
Diffstat (limited to 'net/ipv4/gre_offload.c')
1 files changed, 2 insertions, 8 deletions
diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c
index 29512e3e7e7c..f1d32280cb54 100644
--- a/net/ipv4/gre_offload.c
+++ b/net/ipv4/gre_offload.c
@@ -11,6 +11,7 @@
#include <linux/skbuff.h>
+#include <linux/init.h>
#include <net/protocol.h>
#include <net/gre.h>
@@ -283,11 +284,4 @@ static int __init gre_offload_init(void)
return inet_add_offload(&gre_offload, IPPROTO_GRE);
-static void __exit gre_offload_exit(void)
- inet_del_offload(&gre_offload, IPPROTO_GRE);