diff options
| author |   David S. Miller <davem@sunset.davemloft.net> | 2006-01-11 15:39:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-11 16:32:12 -0800 |
| commit | a7768097557be91d0d4c37e8f2e38cd126c4cdf9 (patch) | |
| tree | 476e148a9e6f861405860df720c5705fb9e14ba8 /net/ipv4/netfilter/ip_conntrack_proto_gre.c | |
| parent | [NET]: Some more missing include/etherdevice.h includes (diff) | |
| download | linux-dev-a7768097557be91d0d4c37e8f2e38cd126c4cdf9.tar.xz linux-dev-a7768097557be91d0d4c37e8f2e38cd126c4cdf9.zip | |
[NETFILTER]: ip_ct_proto_gre_fini() cannot be __exit
It is invoked from failures paths of __init code.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/netfilter/ip_conntrack_proto_gre.c')
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_proto_gre.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_gre.c b/net/ipv4/netfilter/ip_conntrack_proto_gre.c index 57956dee60c8..c777abf16cb7 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_gre.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_gre.c @@ -309,7 +309,10 @@ int __init ip_ct_proto_gre_init(void) return ip_conntrack_protocol_register(&gre); } -void __exit ip_ct_proto_gre_fini(void) +/* This cannot be __exit, as it is invoked from ip_conntrack_helper_pptp.c's + * init() code on errors. + */ +void ip_ct_proto_gre_fini(void) { struct list_head *pos, *n; |