From 685d88e879e7a343e498bad35fd6dd3de0199735 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 11 Jan 2006 15:39:14 -0800 Subject: [PATCH] --- yaml --- r: 17879 b: refs/heads/master c: a7768097557be91d0d4c37e8f2e38cd126c4cdf9 h: refs/heads/master i: 17877: 106fabab1e5ff62a12ff761b42766764428842ec 17875: 903eb1a58eb1ad1b14bcad1702f6f71b82b00a5f 17871: c2b40465abe1d966581c69e8ebaea30157ace329 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_conntrack_helper_pptp.c | 2 +- trunk/net/ipv4/netfilter/ip_conntrack_proto_gre.c | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0b680166cb54..310e96f9a57a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82bf7e97ac5b9fd03aea10df6910cad50d6c032d +refs/heads/master: a7768097557be91d0d4c37e8f2e38cd126c4cdf9 diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_helper_pptp.c b/trunk/net/ipv4/netfilter/ip_conntrack_helper_pptp.c index 4108a5e12b3c..d716bba798f2 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_helper_pptp.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_helper_pptp.c @@ -762,7 +762,7 @@ static struct ip_conntrack_helper pptp = { .help = conntrack_pptp_help }; -extern void __exit ip_ct_proto_gre_fini(void); +extern void ip_ct_proto_gre_fini(void); extern int __init ip_ct_proto_gre_init(void); /* ip_conntrack_pptp initialization */ diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_gre.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_gre.c index 57956dee60c8..c777abf16cb7 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_gre.c +++ b/trunk/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;