projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'core/futexes', 'core/locking', 'core/rcu' and 'linus' into core/urgent
[cascardo/linux.git]
/
net
/
netfilter
/
nf_conntrack_proto_gre.c
diff --git
a/net/netfilter/nf_conntrack_proto_gre.c
b/net/netfilter/nf_conntrack_proto_gre.c
index
4ab62ad
..
1b279f9
100644
(file)
--- a/
net/netfilter/nf_conntrack_proto_gre.c
+++ b/
net/netfilter/nf_conntrack_proto_gre.c
@@
-341,7
+341,7
@@
static int __init nf_ct_proto_gre_init(void)
return rv;
}
-static void nf_ct_proto_gre_fini(void)
+static void
__exit
nf_ct_proto_gre_fini(void)
{
nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_gre4);
unregister_pernet_gen_subsys(proto_gre_net_id, &proto_gre_net_ops);