aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/bridge/netfilter/ebt_802_3.c8
-rw-r--r--net/bridge/netfilter/ebt_among.c8
-rw-r--r--net/bridge/netfilter/ebt_arp.c8
-rw-r--r--net/bridge/netfilter/ebt_arpreply.c8
-rw-r--r--net/bridge/netfilter/ebt_dnat.c8
-rw-r--r--net/bridge/netfilter/ebt_ip.c8
-rw-r--r--net/bridge/netfilter/ebt_limit.c8
-rw-r--r--net/bridge/netfilter/ebt_log.c8
-rw-r--r--net/bridge/netfilter/ebt_mark.c8
-rw-r--r--net/bridge/netfilter/ebt_mark_m.c8
-rw-r--r--net/bridge/netfilter/ebt_pkttype.c8
-rw-r--r--net/bridge/netfilter/ebt_redirect.c8
-rw-r--r--net/bridge/netfilter/ebt_snat.c8
-rw-r--r--net/bridge/netfilter/ebt_stp.c8
-rw-r--r--net/bridge/netfilter/ebt_ulog.c8
-rw-r--r--net/bridge/netfilter/ebt_vlan.c8
-rw-r--r--net/bridge/netfilter/ebtable_broute.c8
-rw-r--r--net/bridge/netfilter/ebtable_filter.c8
-rw-r--r--net/bridge/netfilter/ebtable_nat.c8
-rw-r--r--net/bridge/netfilter/ebtables.c8
-rw-r--r--net/decnet/netfilter/dn_rtmsg.c8
-rw-r--r--net/ipv4/netfilter.c8
-rw-r--r--net/ipv4/netfilter/arp_tables.c8
-rw-r--r--net/ipv4/netfilter/arpt_mangle.c8
-rw-r--r--net/ipv4/netfilter/arptable_filter.c8
-rw-r--r--net/ipv4/netfilter/ip_conntrack_amanda.c8
-rw-r--r--net/ipv4/netfilter/ip_conntrack_ftp.c10
-rw-r--r--net/ipv4/netfilter/ip_conntrack_helper_pptp.c8
-rw-r--r--net/ipv4/netfilter/ip_conntrack_irc.c12
-rw-r--r--net/ipv4/netfilter/ip_conntrack_netbios_ns.c8
-rw-r--r--net/ipv4/netfilter/ip_conntrack_proto_sctp.c8
-rw-r--r--net/ipv4/netfilter/ip_conntrack_standalone.c8
-rw-r--r--net/ipv4/netfilter/ip_conntrack_tftp.c10
-rw-r--r--net/ipv4/netfilter/ip_nat_amanda.c8
-rw-r--r--net/ipv4/netfilter/ip_nat_ftp.c8
-rw-r--r--net/ipv4/netfilter/ip_nat_helper_pptp.c8
-rw-r--r--net/ipv4/netfilter/ip_nat_irc.c8
-rw-r--r--net/ipv4/netfilter/ip_nat_snmp_basic.c8
-rw-r--r--net/ipv4/netfilter/ip_nat_standalone.c8
-rw-r--r--net/ipv4/netfilter/ip_nat_tftp.c8
-rw-r--r--net/ipv4/netfilter/ip_queue.c8
-rw-r--r--net/ipv4/netfilter/ip_tables.c8
-rw-r--r--net/ipv4/netfilter/ipt_CLUSTERIP.c8
-rw-r--r--net/ipv4/netfilter/ipt_DSCP.c8
-rw-r--r--net/ipv4/netfilter/ipt_ECN.c8
-rw-r--r--net/ipv4/netfilter/ipt_LOG.c8
-rw-r--r--net/ipv4/netfilter/ipt_MASQUERADE.c8
-rw-r--r--net/ipv4/netfilter/ipt_NETMAP.c8
-rw-r--r--net/ipv4/netfilter/ipt_REDIRECT.c8
-rw-r--r--net/ipv4/netfilter/ipt_REJECT.c8
-rw-r--r--net/ipv4/netfilter/ipt_SAME.c8
-rw-r--r--net/ipv4/netfilter/ipt_TCPMSS.c8
-rw-r--r--net/ipv4/netfilter/ipt_TOS.c8
-rw-r--r--net/ipv4/netfilter/ipt_TTL.c8
-rw-r--r--net/ipv4/netfilter/ipt_ULOG.c8
-rw-r--r--net/ipv4/netfilter/ipt_addrtype.c8
-rw-r--r--net/ipv4/netfilter/ipt_ah.c8
-rw-r--r--net/ipv4/netfilter/ipt_dscp.c8
-rw-r--r--net/ipv4/netfilter/ipt_ecn.c8
-rw-r--r--net/ipv4/netfilter/ipt_esp.c8
-rw-r--r--net/ipv4/netfilter/ipt_hashlimit.c8
-rw-r--r--net/ipv4/netfilter/ipt_iprange.c8
-rw-r--r--net/ipv4/netfilter/ipt_multiport.c8
-rw-r--r--net/ipv4/netfilter/ipt_owner.c8
-rw-r--r--net/ipv4/netfilter/ipt_recent.c8
-rw-r--r--net/ipv4/netfilter/ipt_tos.c8
-rw-r--r--net/ipv4/netfilter/ipt_ttl.c8
-rw-r--r--net/ipv4/netfilter/iptable_filter.c8
-rw-r--r--net/ipv4/netfilter/iptable_mangle.c8
-rw-r--r--net/ipv4/netfilter/iptable_raw.c8
-rw-r--r--net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c8
-rw-r--r--net/ipv6/netfilter/ip6_queue.c8
-rw-r--r--net/ipv6/netfilter/ip6_tables.c8
-rw-r--r--net/ipv6/netfilter/ip6t_HL.c8
-rw-r--r--net/ipv6/netfilter/ip6t_LOG.c8
-rw-r--r--net/ipv6/netfilter/ip6t_REJECT.c8
-rw-r--r--net/ipv6/netfilter/ip6t_ah.c8
-rw-r--r--net/ipv6/netfilter/ip6t_dst.c8
-rw-r--r--net/ipv6/netfilter/ip6t_esp.c8
-rw-r--r--net/ipv6/netfilter/ip6t_eui64.c8
-rw-r--r--net/ipv6/netfilter/ip6t_frag.c8
-rw-r--r--net/ipv6/netfilter/ip6t_hbh.c8
-rw-r--r--net/ipv6/netfilter/ip6t_hl.c8
-rw-r--r--net/ipv6/netfilter/ip6t_multiport.c8
-rw-r--r--net/ipv6/netfilter/ip6t_owner.c8
-rw-r--r--net/ipv6/netfilter/ip6t_rt.c8
-rw-r--r--net/ipv6/netfilter/ip6table_filter.c8
-rw-r--r--net/ipv6/netfilter/ip6table_mangle.c8
-rw-r--r--net/ipv6/netfilter/ip6table_raw.c8
-rw-r--r--net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c8
-rw-r--r--net/netfilter/nf_conntrack_ftp.c10
-rw-r--r--net/netfilter/nf_conntrack_proto_sctp.c8
-rw-r--r--net/netfilter/nf_conntrack_standalone.c8
-rw-r--r--net/netfilter/nfnetlink_log.c8
-rw-r--r--net/netfilter/nfnetlink_queue.c8
-rw-r--r--net/netfilter/xt_CLASSIFY.c8
-rw-r--r--net/netfilter/xt_CONNMARK.c8
-rw-r--r--net/netfilter/xt_MARK.c8
-rw-r--r--net/netfilter/xt_NFQUEUE.c8
-rw-r--r--net/netfilter/xt_NOTRACK.c8
-rw-r--r--net/netfilter/xt_comment.c8
-rw-r--r--net/netfilter/xt_connbytes.c8
-rw-r--r--net/netfilter/xt_connmark.c8
-rw-r--r--net/netfilter/xt_conntrack.c8
-rw-r--r--net/netfilter/xt_dccp.c8
-rw-r--r--net/netfilter/xt_helper.c8
-rw-r--r--net/netfilter/xt_length.c8
-rw-r--r--net/netfilter/xt_limit.c8
-rw-r--r--net/netfilter/xt_mac.c8
-rw-r--r--net/netfilter/xt_mark.c8
-rw-r--r--net/netfilter/xt_physdev.c8
-rw-r--r--net/netfilter/xt_pkttype.c8
-rw-r--r--net/netfilter/xt_realm.c8
-rw-r--r--net/netfilter/xt_sctp.c8
-rw-r--r--net/netfilter/xt_state.c8
-rw-r--r--net/netfilter/xt_string.c8
-rw-r--r--net/netfilter/xt_tcpmss.c8
-rw-r--r--net/netfilter/xt_tcpudp.c8
118 files changed, 477 insertions, 477 deletions
diff --git a/net/bridge/netfilter/ebt_802_3.c b/net/bridge/netfilter/ebt_802_3.c
index 468ebdf4bc1c..d42f63f5e9f8 100644
--- a/net/bridge/netfilter/ebt_802_3.c
+++ b/net/bridge/netfilter/ebt_802_3.c
@@ -58,16 +58,16 @@ static struct ebt_match filter_802_3 =
58 .me = THIS_MODULE, 58 .me = THIS_MODULE,
59}; 59};
60 60
61static int __init init(void) 61static int __init ebt_802_3_init(void)
62{ 62{
63 return ebt_register_match(&filter_802_3); 63 return ebt_register_match(&filter_802_3);
64} 64}
65 65
66static void __exit fini(void) 66static void __exit ebt_802_3_fini(void)
67{ 67{
68 ebt_unregister_match(&filter_802_3); 68 ebt_unregister_match(&filter_802_3);
69} 69}
70 70
71module_init(init); 71module_init(ebt_802_3_init);
72module_exit(fini); 72module_exit(ebt_802_3_fini);
73MODULE_LICENSE("GPL"); 73MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebt_among.c b/net/bridge/netfilter/ebt_among.c
index 5a1f5e3bff15..a614485828af 100644
--- a/net/bridge/netfilter/ebt_among.c
+++ b/net/bridge/netfilter/ebt_among.c
@@ -213,16 +213,16 @@ static struct ebt_match filter_among = {
213 .me = THIS_MODULE, 213 .me = THIS_MODULE,
214}; 214};
215 215
216static int __init init(void) 216static int __init ebt_among_init(void)
217{ 217{
218 return ebt_register_match(&filter_among); 218 return ebt_register_match(&filter_among);
219} 219}
220 220
221static void __exit fini(void) 221static void __exit ebt_among_fini(void)
222{ 222{
223 ebt_unregister_match(&filter_among); 223 ebt_unregister_match(&filter_among);
224} 224}
225 225
226module_init(init); 226module_init(ebt_among_init);
227module_exit(fini); 227module_exit(ebt_among_fini);
228MODULE_LICENSE("GPL"); 228MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebt_arp.c b/net/bridge/netfilter/ebt_arp.c
index b94c48cb6e4b..a6c81d9f73b8 100644
--- a/net/bridge/netfilter/ebt_arp.c
+++ b/net/bridge/netfilter/ebt_arp.c
@@ -125,16 +125,16 @@ static struct ebt_match filter_arp =
125 .me = THIS_MODULE, 125 .me = THIS_MODULE,
126}; 126};
127 127
128static int __init init(void) 128static int __init ebt_arp_init(void)
129{ 129{
130 return ebt_register_match(&filter_arp); 130 return ebt_register_match(&filter_arp);
131} 131}
132 132
133static void __exit fini(void) 133static void __exit ebt_arp_fini(void)
134{ 134{
135 ebt_unregister_match(&filter_arp); 135 ebt_unregister_match(&filter_arp);
136} 136}
137 137
138module_init(init); 138module_init(ebt_arp_init);
139module_exit(fini); 139module_exit(ebt_arp_fini);
140MODULE_LICENSE("GPL"); 140MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebt_arpreply.c b/net/bridge/netfilter/ebt_arpreply.c
index b934de90f7c5..d19fc4b328dc 100644
--- a/net/bridge/netfilter/ebt_arpreply.c
+++ b/net/bridge/netfilter/ebt_arpreply.c
@@ -82,16 +82,16 @@ static struct ebt_target reply_target =
82 .me = THIS_MODULE, 82 .me = THIS_MODULE,
83}; 83};
84 84
85static int __init init(void) 85static int __init ebt_arpreply_init(void)
86{ 86{
87 return ebt_register_target(&reply_target); 87 return ebt_register_target(&reply_target);
88} 88}
89 89
90static void __exit fini(void) 90static void __exit ebt_arpreply_fini(void)
91{ 91{
92 ebt_unregister_target(&reply_target); 92 ebt_unregister_target(&reply_target);
93} 93}
94 94
95module_init(init); 95module_init(ebt_arpreply_init);
96module_exit(fini); 96module_exit(ebt_arpreply_fini);
97MODULE_LICENSE("GPL"); 97MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebt_dnat.c b/net/bridge/netfilter/ebt_dnat.c
index f5463086c7bd..4582659dff0e 100644
--- a/net/bridge/netfilter/ebt_dnat.c
+++ b/net/bridge/netfilter/ebt_dnat.c
@@ -61,16 +61,16 @@ static struct ebt_target dnat =
61 .me = THIS_MODULE, 61 .me = THIS_MODULE,
62}; 62};
63 63
64static int __init init(void) 64static int __init ebt_dnat_init(void)
65{ 65{
66 return ebt_register_target(&dnat); 66 return ebt_register_target(&dnat);
67} 67}
68 68
69static void __exit fini(void) 69static void __exit ebt_dnat_fini(void)
70{ 70{
71 ebt_unregister_target(&dnat); 71 ebt_unregister_target(&dnat);
72} 72}
73 73
74module_init(init); 74module_init(ebt_dnat_init);
75module_exit(fini); 75module_exit(ebt_dnat_fini);
76MODULE_LICENSE("GPL"); 76MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c
index dc5d0b2427cf..65b665ce57b5 100644
--- a/net/bridge/netfilter/ebt_ip.c
+++ b/net/bridge/netfilter/ebt_ip.c
@@ -112,16 +112,16 @@ static struct ebt_match filter_ip =
112 .me = THIS_MODULE, 112 .me = THIS_MODULE,
113}; 113};
114 114
115static int __init init(void) 115static int __init ebt_ip_init(void)
116{ 116{
117 return ebt_register_match(&filter_ip); 117 return ebt_register_match(&filter_ip);
118} 118}
119 119
120static void __exit fini(void) 120static void __exit ebt_ip_fini(void)
121{ 121{
122 ebt_unregister_match(&filter_ip); 122 ebt_unregister_match(&filter_ip);
123} 123}
124 124
125module_init(init); 125module_init(ebt_ip_init);
126module_exit(fini); 126module_exit(ebt_ip_fini);
127MODULE_LICENSE("GPL"); 127MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebt_limit.c b/net/bridge/netfilter/ebt_limit.c
index 637c8844cd5f..d48fa5cb26cf 100644
--- a/net/bridge/netfilter/ebt_limit.c
+++ b/net/bridge/netfilter/ebt_limit.c
@@ -98,16 +98,16 @@ static struct ebt_match ebt_limit_reg =
98 .me = THIS_MODULE, 98 .me = THIS_MODULE,
99}; 99};
100 100
101static int __init init(void) 101static int __init ebt_limit_init(void)
102{ 102{
103 return ebt_register_match(&ebt_limit_reg); 103 return ebt_register_match(&ebt_limit_reg);
104} 104}
105 105
106static void __exit fini(void) 106static void __exit ebt_limit_fini(void)
107{ 107{
108 ebt_unregister_match(&ebt_limit_reg); 108 ebt_unregister_match(&ebt_limit_reg);
109} 109}
110 110
111module_init(init); 111module_init(ebt_limit_init);
112module_exit(fini); 112module_exit(ebt_limit_fini);
113MODULE_LICENSE("GPL"); 113MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c
index 288ff1d4ccc4..d159c92cca84 100644
--- a/net/bridge/netfilter/ebt_log.c
+++ b/net/bridge/netfilter/ebt_log.c
@@ -188,7 +188,7 @@ static struct nf_logger ebt_log_logger = {
188 .me = THIS_MODULE, 188 .me = THIS_MODULE,
189}; 189};
190 190
191static int __init init(void) 191static int __init ebt_log_init(void)
192{ 192{
193 int ret; 193 int ret;
194 194
@@ -205,12 +205,12 @@ static int __init init(void)
205 return 0; 205 return 0;
206} 206}
207 207
208static void __exit fini(void) 208static void __exit ebt_log_fini(void)
209{ 209{
210 nf_log_unregister_logger(&ebt_log_logger); 210 nf_log_unregister_logger(&ebt_log_logger);
211 ebt_unregister_watcher(&log); 211 ebt_unregister_watcher(&log);
212} 212}
213 213
214module_init(init); 214module_init(ebt_log_init);
215module_exit(fini); 215module_exit(ebt_log_fini);
216MODULE_LICENSE("GPL"); 216MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebt_mark.c b/net/bridge/netfilter/ebt_mark.c
index c93d35ab95c0..770c0df972a3 100644
--- a/net/bridge/netfilter/ebt_mark.c
+++ b/net/bridge/netfilter/ebt_mark.c
@@ -52,16 +52,16 @@ static struct ebt_target mark_target =
52 .me = THIS_MODULE, 52 .me = THIS_MODULE,
53}; 53};
54 54
55static int __init init(void) 55static int __init ebt_mark_init(void)
56{ 56{
57 return ebt_register_target(&mark_target); 57 return ebt_register_target(&mark_target);
58} 58}
59 59
60static void __exit fini(void) 60static void __exit ebt_mark_fini(void)
61{ 61{
62 ebt_unregister_target(&mark_target); 62 ebt_unregister_target(&mark_target);
63} 63}
64 64
65module_init(init); 65module_init(ebt_mark_init);
66module_exit(fini); 66module_exit(ebt_mark_fini);
67MODULE_LICENSE("GPL"); 67MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebt_mark_m.c b/net/bridge/netfilter/ebt_mark_m.c
index 625102de1495..a6413e4b4982 100644
--- a/net/bridge/netfilter/ebt_mark_m.c
+++ b/net/bridge/netfilter/ebt_mark_m.c
@@ -47,16 +47,16 @@ static struct ebt_match filter_mark =
47 .me = THIS_MODULE, 47 .me = THIS_MODULE,
48}; 48};
49 49
50static int __init init(void) 50static int __init ebt_mark_m_init(void)
51{ 51{
52 return ebt_register_match(&filter_mark); 52 return ebt_register_match(&filter_mark);
53} 53}
54 54
55static void __exit fini(void) 55static void __exit ebt_mark_m_fini(void)
56{ 56{
57 ebt_unregister_match(&filter_mark); 57 ebt_unregister_match(&filter_mark);
58} 58}
59 59
60module_init(init); 60module_init(ebt_mark_m_init);
61module_exit(fini); 61module_exit(ebt_mark_m_fini);
62MODULE_LICENSE("GPL"); 62MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebt_pkttype.c b/net/bridge/netfilter/ebt_pkttype.c
index ecd3b42b19b0..4fffd70e4da7 100644
--- a/net/bridge/netfilter/ebt_pkttype.c
+++ b/net/bridge/netfilter/ebt_pkttype.c
@@ -44,16 +44,16 @@ static struct ebt_match filter_pkttype =
44 .me = THIS_MODULE, 44 .me = THIS_MODULE,
45}; 45};
46 46
47static int __init init(void) 47static int __init ebt_pkttype_init(void)
48{ 48{
49 return ebt_register_match(&filter_pkttype); 49 return ebt_register_match(&filter_pkttype);
50} 50}
51 51
52static void __exit fini(void) 52static void __exit ebt_pkttype_fini(void)
53{ 53{
54 ebt_unregister_match(&filter_pkttype); 54 ebt_unregister_match(&filter_pkttype);
55} 55}
56 56
57module_init(init); 57module_init(ebt_pkttype_init);
58module_exit(fini); 58module_exit(ebt_pkttype_fini);
59MODULE_LICENSE("GPL"); 59MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebt_redirect.c b/net/bridge/netfilter/ebt_redirect.c
index 1538b4386662..9f378eab72d0 100644
--- a/net/bridge/netfilter/ebt_redirect.c
+++ b/net/bridge/netfilter/ebt_redirect.c
@@ -66,16 +66,16 @@ static struct ebt_target redirect_target =
66 .me = THIS_MODULE, 66 .me = THIS_MODULE,
67}; 67};
68 68
69static int __init init(void) 69static int __init ebt_redirect_init(void)
70{ 70{
71 return ebt_register_target(&redirect_target); 71 return ebt_register_target(&redirect_target);
72} 72}
73 73
74static void __exit fini(void) 74static void __exit ebt_redirect_fini(void)
75{ 75{
76 ebt_unregister_target(&redirect_target); 76 ebt_unregister_target(&redirect_target);
77} 77}
78 78
79module_init(init); 79module_init(ebt_redirect_init);
80module_exit(fini); 80module_exit(ebt_redirect_fini);
81MODULE_LICENSE("GPL"); 81MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebt_snat.c b/net/bridge/netfilter/ebt_snat.c
index 1529bdcb9a48..cbb33e24ca8a 100644
--- a/net/bridge/netfilter/ebt_snat.c
+++ b/net/bridge/netfilter/ebt_snat.c
@@ -61,16 +61,16 @@ static struct ebt_target snat =
61 .me = THIS_MODULE, 61 .me = THIS_MODULE,
62}; 62};
63 63
64static int __init init(void) 64static int __init ebt_snat_init(void)
65{ 65{
66 return ebt_register_target(&snat); 66 return ebt_register_target(&snat);
67} 67}
68 68
69static void __exit fini(void) 69static void __exit ebt_snat_fini(void)
70{ 70{
71 ebt_unregister_target(&snat); 71 ebt_unregister_target(&snat);
72} 72}
73 73
74module_init(init); 74module_init(ebt_snat_init);
75module_exit(fini); 75module_exit(ebt_snat_fini);
76MODULE_LICENSE("GPL"); 76MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebt_stp.c b/net/bridge/netfilter/ebt_stp.c
index 0248c67277ee..a0bed82145ed 100644
--- a/net/bridge/netfilter/ebt_stp.c
+++ b/net/bridge/netfilter/ebt_stp.c
@@ -180,16 +180,16 @@ static struct ebt_match filter_stp =
180 .me = THIS_MODULE, 180 .me = THIS_MODULE,
181}; 181};
182 182
183static int __init init(void) 183static int __init ebt_stp_init(void)
184{ 184{
185 return ebt_register_match(&filter_stp); 185 return ebt_register_match(&filter_stp);
186} 186}
187 187
188static void __exit fini(void) 188static void __exit ebt_stp_fini(void)
189{ 189{
190 ebt_unregister_match(&filter_stp); 190 ebt_unregister_match(&filter_stp);
191} 191}
192 192
193module_init(init); 193module_init(ebt_stp_init);
194module_exit(fini); 194module_exit(ebt_stp_fini);
195MODULE_LICENSE("GPL"); 195MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index 802baf755ef4..ee5a51761260 100644
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -281,7 +281,7 @@ static struct nf_logger ebt_ulog_logger = {
281 .me = THIS_MODULE, 281 .me = THIS_MODULE,
282}; 282};
283 283
284static int __init init(void) 284static int __init ebt_ulog_init(void)
285{ 285{
286 int i, ret = 0; 286 int i, ret = 0;
287 287
@@ -316,7 +316,7 @@ static int __init init(void)
316 return ret; 316 return ret;
317} 317}
318 318
319static void __exit fini(void) 319static void __exit ebt_ulog_fini(void)
320{ 320{
321 ebt_ulog_buff_t *ub; 321 ebt_ulog_buff_t *ub;
322 int i; 322 int i;
@@ -337,8 +337,8 @@ static void __exit fini(void)
337 sock_release(ebtulognl->sk_socket); 337 sock_release(ebtulognl->sk_socket);
338} 338}
339 339
340module_init(init); 340module_init(ebt_ulog_init);
341module_exit(fini); 341module_exit(ebt_ulog_fini);
342MODULE_LICENSE("GPL"); 342MODULE_LICENSE("GPL");
343MODULE_AUTHOR("Bart De Schuymer <bdschuym@pandora.be>"); 343MODULE_AUTHOR("Bart De Schuymer <bdschuym@pandora.be>");
344MODULE_DESCRIPTION("ebtables userspace logging module for bridged Ethernet" 344MODULE_DESCRIPTION("ebtables userspace logging module for bridged Ethernet"
diff --git a/net/bridge/netfilter/ebt_vlan.c b/net/bridge/netfilter/ebt_vlan.c
index db60d734908b..a2b452862b73 100644
--- a/net/bridge/netfilter/ebt_vlan.c
+++ b/net/bridge/netfilter/ebt_vlan.c
@@ -178,7 +178,7 @@ static struct ebt_match filter_vlan = {
178 .me = THIS_MODULE, 178 .me = THIS_MODULE,
179}; 179};
180 180
181static int __init init(void) 181static int __init ebt_vlan_init(void)
182{ 182{
183 DEBUG_MSG("ebtables 802.1Q extension module v" 183 DEBUG_MSG("ebtables 802.1Q extension module v"
184 MODULE_VERS "\n"); 184 MODULE_VERS "\n");
@@ -186,10 +186,10 @@ static int __init init(void)
186 return ebt_register_match(&filter_vlan); 186 return ebt_register_match(&filter_vlan);
187} 187}
188 188
189static void __exit fini(void) 189static void __exit ebt_vlan_fini(void)
190{ 190{
191 ebt_unregister_match(&filter_vlan); 191 ebt_unregister_match(&filter_vlan);
192} 192}
193 193
194module_init(init); 194module_init(ebt_vlan_init);
195module_exit(fini); 195module_exit(ebt_vlan_fini);
diff --git a/net/bridge/netfilter/ebtable_broute.c b/net/bridge/netfilter/ebtable_broute.c
index 1767c94cd3de..9a6e548e148b 100644
--- a/net/bridge/netfilter/ebtable_broute.c
+++ b/net/bridge/netfilter/ebtable_broute.c
@@ -62,7 +62,7 @@ static int ebt_broute(struct sk_buff **pskb)
62 return 0; /* bridge it */ 62 return 0; /* bridge it */
63} 63}
64 64
65static int __init init(void) 65static int __init ebtable_broute_init(void)
66{ 66{
67 int ret; 67 int ret;
68 68
@@ -74,13 +74,13 @@ static int __init init(void)
74 return ret; 74 return ret;
75} 75}
76 76
77static void __exit fini(void) 77static void __exit ebtable_broute_fini(void)
78{ 78{
79 br_should_route_hook = NULL; 79 br_should_route_hook = NULL;
80 synchronize_net(); 80 synchronize_net();
81 ebt_unregister_table(&broute_table); 81 ebt_unregister_table(&broute_table);
82} 82}
83 83
84module_init(init); 84module_init(ebtable_broute_init);
85module_exit(fini); 85module_exit(ebtable_broute_fini);
86MODULE_LICENSE("GPL"); 86MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebtable_filter.c b/net/bridge/netfilter/ebtable_filter.c
index c18666e0392b..3d5bd44f2395 100644
--- a/net/bridge/netfilter/ebtable_filter.c
+++ b/net/bridge/netfilter/ebtable_filter.c
@@ -91,7 +91,7 @@ static struct nf_hook_ops ebt_ops_filter[] = {
91 }, 91 },
92}; 92};
93 93
94static int __init init(void) 94static int __init ebtable_filter_init(void)
95{ 95{
96 int i, j, ret; 96 int i, j, ret;
97 97
@@ -109,7 +109,7 @@ cleanup:
109 return ret; 109 return ret;
110} 110}
111 111
112static void __exit fini(void) 112static void __exit ebtable_filter_fini(void)
113{ 113{
114 int i; 114 int i;
115 115
@@ -118,6 +118,6 @@ static void __exit fini(void)
118 ebt_unregister_table(&frame_filter); 118 ebt_unregister_table(&frame_filter);
119} 119}
120 120
121module_init(init); 121module_init(ebtable_filter_init);
122module_exit(fini); 122module_exit(ebtable_filter_fini);
123MODULE_LICENSE("GPL"); 123MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebtable_nat.c b/net/bridge/netfilter/ebtable_nat.c
index 828cac2cc4a3..04dd42efda1d 100644
--- a/net/bridge/netfilter/ebtable_nat.c
+++ b/net/bridge/netfilter/ebtable_nat.c
@@ -98,7 +98,7 @@ static struct nf_hook_ops ebt_ops_nat[] = {
98 }, 98 },
99}; 99};
100 100
101static int __init init(void) 101static int __init ebtable_nat_init(void)
102{ 102{
103 int i, ret, j; 103 int i, ret, j;
104 104
@@ -116,7 +116,7 @@ cleanup:
116 return ret; 116 return ret;
117} 117}
118 118
119static void __exit fini(void) 119static void __exit ebtable_nat_fini(void)
120{ 120{
121 int i; 121 int i;
122 122
@@ -125,6 +125,6 @@ static void __exit fini(void)
125 ebt_unregister_table(&frame_nat); 125 ebt_unregister_table(&frame_nat);
126} 126}
127 127
128module_init(init); 128module_init(ebtable_nat_init);
129module_exit(fini); 129module_exit(ebtable_nat_fini);
130MODULE_LICENSE("GPL"); 130MODULE_LICENSE("GPL");
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 997953367204..01eae97c53d9 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1487,7 +1487,7 @@ static struct nf_sockopt_ops ebt_sockopts =
1487 .get = do_ebt_get_ctl, 1487 .get = do_ebt_get_ctl,
1488}; 1488};
1489 1489
1490static int __init init(void) 1490static int __init ebtables_init(void)
1491{ 1491{
1492 int ret; 1492 int ret;
1493 1493
@@ -1501,7 +1501,7 @@ static int __init init(void)
1501 return 0; 1501 return 0;
1502} 1502}
1503 1503
1504static void __exit fini(void) 1504static void __exit ebtables_fini(void)
1505{ 1505{
1506 nf_unregister_sockopt(&ebt_sockopts); 1506 nf_unregister_sockopt(&ebt_sockopts);
1507 printk(KERN_NOTICE "Ebtables v2.0 unregistered\n"); 1507 printk(KERN_NOTICE "Ebtables v2.0 unregistered\n");
@@ -1516,6 +1516,6 @@ EXPORT_SYMBOL(ebt_unregister_watcher);
1516EXPORT_SYMBOL(ebt_register_target); 1516EXPORT_SYMBOL(ebt_register_target);
1517EXPORT_SYMBOL(ebt_unregister_target); 1517EXPORT_SYMBOL(ebt_unregister_target);
1518EXPORT_SYMBOL(ebt_do_table); 1518EXPORT_SYMBOL(ebt_do_table);
1519module_init(init); 1519module_init(ebtables_init);
1520module_exit(fini); 1520module_exit(ebtables_fini);
1521MODULE_LICENSE("GPL"); 1521MODULE_LICENSE("GPL");
diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c
index 16a5a31e2126..74133ecd7700 100644
--- a/net/decnet/netfilter/dn_rtmsg.c
+++ b/net/decnet/netfilter/dn_rtmsg.c
@@ -133,7 +133,7 @@ static struct nf_hook_ops dnrmg_ops = {
133 .priority = NF_DN_PRI_DNRTMSG, 133 .priority = NF_DN_PRI_DNRTMSG,
134}; 134};
135 135
136static int __init init(void) 136static int __init dn_rtmsg_init(void)
137{ 137{
138 int rv = 0; 138 int rv = 0;
139 139
@@ -152,7 +152,7 @@ static int __init init(void)
152 return rv; 152 return rv;
153} 153}
154 154
155static void __exit fini(void) 155static void __exit dn_rtmsg_fini(void)
156{ 156{
157 nf_unregister_hook(&dnrmg_ops); 157 nf_unregister_hook(&dnrmg_ops);
158 sock_release(dnrmg->sk_socket); 158 sock_release(dnrmg->sk_socket);
@@ -164,6 +164,6 @@ MODULE_AUTHOR("Steven Whitehouse <steve@chygwyn.com>");
164MODULE_LICENSE("GPL"); 164MODULE_LICENSE("GPL");
165MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_DNRTMSG); 165MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_DNRTMSG);
166 166
167module_init(init); 167module_init(dn_rtmsg_init);
168module_exit(fini); 168module_exit(dn_rtmsg_fini);
169 169
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index ed42cdc57cd9..b5ad9ac2fbcc 100644
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -167,15 +167,15 @@ static struct nf_queue_rerouter ip_reroute = {
167 .reroute = queue_reroute, 167 .reroute = queue_reroute,
168}; 168};
169 169
170static int init(void) 170static int ipv4_netfilter_init(void)
171{ 171{
172 return nf_register_queue_rerouter(PF_INET, &ip_reroute); 172 return nf_register_queue_rerouter(PF_INET, &ip_reroute);
173} 173}
174 174
175static void fini(void) 175static void ipv4_netfilter_fini(void)
176{ 176{
177 nf_unregister_queue_rerouter(PF_INET); 177 nf_unregister_queue_rerouter(PF_INET);
178} 178}
179 179
180module_init(init); 180module_init(ipv4_netfilter_init);
181module_exit(fini); 181module_exit(ipv4_netfilter_fini);
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index ff0c594a4198..a44a5d73457d 100644
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -1166,7 +1166,7 @@ static struct nf_sockopt_ops arpt_sockopts = {
1166 .get = do_arpt_get_ctl, 1166 .get = do_arpt_get_ctl,
1167}; 1167};
1168 1168
1169static int __init init(void) 1169static int __init arp_tables_init(void)
1170{ 1170{
1171 int ret; 1171 int ret;
1172 1172
@@ -1187,7 +1187,7 @@ static int __init init(void)
1187 return 0; 1187 return 0;
1188} 1188}
1189 1189
1190static void __exit fini(void) 1190static void __exit arp_tables_fini(void)
1191{ 1191{
1192 nf_unregister_sockopt(&arpt_sockopts); 1192 nf_unregister_sockopt(&arpt_sockopts);
1193 xt_proto_fini(NF_ARP); 1193 xt_proto_fini(NF_ARP);
@@ -1197,5 +1197,5 @@ EXPORT_SYMBOL(arpt_register_table);
1197EXPORT_SYMBOL(arpt_unregister_table); 1197EXPORT_SYMBOL(arpt_unregister_table);
1198EXPORT_SYMBOL(arpt_do_table); 1198EXPORT_SYMBOL(arpt_do_table);
1199 1199
1200module_init(init); 1200module_init(arp_tables_init);
1201module_exit(fini); 1201module_exit(arp_tables_fini);
diff --git a/net/ipv4/netfilter/arpt_mangle.c b/net/ipv4/netfilter/arpt_mangle.c
index 0f2a95350e26..a58325c1ceb9 100644
--- a/net/ipv4/netfilter/arpt_mangle.c
+++ b/net/ipv4/netfilter/arpt_mangle.c
@@ -89,7 +89,7 @@ static struct arpt_target arpt_mangle_reg = {
89 .me = THIS_MODULE, 89 .me = THIS_MODULE,
90}; 90};
91 91
92static int __init init(void) 92static int __init arpt_mangle_init(void)
93{ 93{
94 if (arpt_register_target(&arpt_mangle_reg)) 94 if (arpt_register_target(&arpt_mangle_reg))
95 return -EINVAL; 95 return -EINVAL;
@@ -97,10 +97,10 @@ static int __init init(void)
97 return 0; 97 return 0;
98} 98}
99 99
100static void __exit fini(void) 100static void __exit arpt_mangle_fini(void)
101{ 101{
102 arpt_unregister_target(&arpt_mangle_reg); 102 arpt_unregister_target(&arpt_mangle_reg);
103} 103}
104 104
105module_init(init); 105module_init(arpt_mangle_init);
106module_exit(fini); 106module_exit(arpt_mangle_fini);
diff --git a/net/ipv4/netfilter/arptable_filter.c b/net/ipv4/netfilter/arptable_filter.c
index f6ab45f48681..d0d379c7df9a 100644
--- a/net/ipv4/netfilter/arptable_filter.c
+++ b/net/ipv4/netfilter/arptable_filter.c
@@ -179,7 +179,7 @@ static struct nf_hook_ops arpt_ops[] = {
179 }, 179 },
180}; 180};
181 181
182static int __init init(void) 182static int __init arptable_filter_init(void)
183{ 183{
184 int ret, i; 184 int ret, i;
185 185
@@ -201,7 +201,7 @@ cleanup_hooks:
201 return ret; 201 return ret;
202} 202}
203 203
204static void __exit fini(void) 204static void __exit arptable_filter_fini(void)
205{ 205{
206 unsigned int i; 206 unsigned int i;
207 207
@@ -211,5 +211,5 @@ static void __exit fini(void)
211 arpt_unregister_table(&packet_filter); 211 arpt_unregister_table(&packet_filter);
212} 212}
213 213
214module_init(init); 214module_init(arptable_filter_init);
215module_exit(fini); 215module_exit(arptable_filter_fini);
diff --git a/net/ipv4/netfilter/ip_conntrack_amanda.c b/net/ipv4/netfilter/ip_conntrack_amanda.c
index 84e4f79b7ffa..a604b1ccfdaa 100644
--- a/net/ipv4/netfilter/ip_conntrack_amanda.c
+++ b/net/ipv4/netfilter/ip_conntrack_amanda.c
@@ -153,13 +153,13 @@ static struct ip_conntrack_helper amanda_helper = {
153 }, 153 },
154}; 154};
155 155
156static void __exit fini(void) 156static void __exit ip_conntrack_amanda_fini(void)
157{ 157{
158 ip_conntrack_helper_unregister(&amanda_helper); 158 ip_conntrack_helper_unregister(&amanda_helper);
159 kfree(amanda_buffer); 159 kfree(amanda_buffer);
160} 160}
161 161
162static int __init init(void) 162static int __init ip_conntrack_amanda_init(void)
163{ 163{
164 int ret; 164 int ret;
165 165
@@ -177,5 +177,5 @@ static int __init init(void)
177 177
178} 178}
179 179
180module_init(init); 180module_init(ip_conntrack_amanda_init);
181module_exit(fini); 181module_exit(ip_conntrack_amanda_fini);
diff --git a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c
index e627e5856172..3e542bf28a9d 100644
--- a/net/ipv4/netfilter/ip_conntrack_ftp.c
+++ b/net/ipv4/netfilter/ip_conntrack_ftp.c
@@ -453,7 +453,7 @@ static struct ip_conntrack_helper ftp[MAX_PORTS];
453static char ftp_names[MAX_PORTS][sizeof("ftp-65535")]; 453static char ftp_names[MAX_PORTS][sizeof("ftp-65535")];
454 454
455/* Not __exit: called from init() */ 455/* Not __exit: called from init() */
456static void fini(void) 456static void ip_conntrack_ftp_fini(void)
457{ 457{
458 int i; 458 int i;
459 for (i = 0; i < ports_c; i++) { 459 for (i = 0; i < ports_c; i++) {
@@ -465,7 +465,7 @@ static void fini(void)
465 kfree(ftp_buffer); 465 kfree(ftp_buffer);
466} 466}
467 467
468static int __init init(void) 468static int __init ip_conntrack_ftp_init(void)
469{ 469{
470 int i, ret; 470 int i, ret;
471 char *tmpname; 471 char *tmpname;
@@ -499,12 +499,12 @@ static int __init init(void)
499 ret = ip_conntrack_helper_register(&ftp[i]); 499 ret = ip_conntrack_helper_register(&ftp[i]);
500 500
501 if (ret) { 501 if (ret) {
502 fini(); 502 ip_conntrack_ftp_fini();
503 return ret; 503 return ret;
504 } 504 }
505 } 505 }
506 return 0; 506 return 0;
507} 507}
508 508
509module_init(init); 509module_init(ip_conntrack_ftp_init);
510module_exit(fini); 510module_exit(ip_conntrack_ftp_fini);
diff --git a/net/ipv4/netfilter/ip_conntrack_helper_pptp.c b/net/ipv4/netfilter/ip_conntrack_helper_pptp.c
index d716bba798f2..7d3ba4302e9e 100644
--- a/net/ipv4/netfilter/ip_conntrack_helper_pptp.c
+++ b/net/ipv4/netfilter/ip_conntrack_helper_pptp.c
@@ -766,7 +766,7 @@ extern void ip_ct_proto_gre_fini(void);
766extern int __init ip_ct_proto_gre_init(void); 766extern int __init ip_ct_proto_gre_init(void);
767 767
768/* ip_conntrack_pptp initialization */ 768/* ip_conntrack_pptp initialization */
769static int __init init(void) 769static int __init ip_conntrack_helper_pptp_init(void)
770{ 770{
771 int retcode; 771 int retcode;
772 772
@@ -786,15 +786,15 @@ static int __init init(void)
786 return 0; 786 return 0;
787} 787}
788 788
789static void __exit fini(void) 789static void __exit ip_conntrack_helper_pptp_fini(void)
790{ 790{
791 ip_conntrack_helper_unregister(&pptp); 791 ip_conntrack_helper_unregister(&pptp);
792 ip_ct_proto_gre_fini(); 792 ip_ct_proto_gre_fini();
793 printk("ip_conntrack_pptp version %s unloaded\n", IP_CT_PPTP_VERSION); 793 printk("ip_conntrack_pptp version %s unloaded\n", IP_CT_PPTP_VERSION);
794} 794}
795 795
796module_init(init); 796module_init(ip_conntrack_helper_pptp_init);
797module_exit(fini); 797module_exit(ip_conntrack_helper_pptp_fini);
798 798
799EXPORT_SYMBOL(ip_nat_pptp_hook_outbound); 799EXPORT_SYMBOL(ip_nat_pptp_hook_outbound);
800EXPORT_SYMBOL(ip_nat_pptp_hook_inbound); 800EXPORT_SYMBOL(ip_nat_pptp_hook_inbound);
diff --git a/net/ipv4/netfilter/ip_conntrack_irc.c b/net/ipv4/netfilter/ip_conntrack_irc.c
index c51a2cf71b4b..a2ac5ce544b2 100644
--- a/net/ipv4/netfilter/ip_conntrack_irc.c
+++ b/net/ipv4/netfilter/ip_conntrack_irc.c
@@ -242,9 +242,9 @@ static int help(struct sk_buff **pskb,
242static struct ip_conntrack_helper irc_helpers[MAX_PORTS]; 242static struct ip_conntrack_helper irc_helpers[MAX_PORTS];
243static char irc_names[MAX_PORTS][sizeof("irc-65535")]; 243static char irc_names[MAX_PORTS][sizeof("irc-65535")];
244 244
245static void fini(void); 245static void ip_conntrack_irc_fini(void);
246 246
247static int __init init(void) 247static int __init ip_conntrack_irc_init(void)
248{ 248{
249 int i, ret; 249 int i, ret;
250 struct ip_conntrack_helper *hlpr; 250 struct ip_conntrack_helper *hlpr;
@@ -288,7 +288,7 @@ static int __init init(void)
288 if (ret) { 288 if (ret) {
289 printk("ip_conntrack_irc: ERROR registering port %d\n", 289 printk("ip_conntrack_irc: ERROR registering port %d\n",
290 ports[i]); 290 ports[i]);
291 fini(); 291 ip_conntrack_irc_fini();
292 return -EBUSY; 292 return -EBUSY;
293 } 293 }
294 } 294 }
@@ -297,7 +297,7 @@ static int __init init(void)
297 297
298/* This function is intentionally _NOT_ defined as __exit, because 298/* This function is intentionally _NOT_ defined as __exit, because
299 * it is needed by the init function */ 299 * it is needed by the init function */
300static void fini(void) 300static void ip_conntrack_irc_fini(void)
301{ 301{
302 int i; 302 int i;
303 for (i = 0; i < ports_c; i++) { 303 for (i = 0; i < ports_c; i++) {
@@ -308,5 +308,5 @@ static void fini(void)
308 kfree(irc_buffer); 308 kfree(irc_buffer);
309} 309}
310 310
311module_init(init); 311module_init(ip_conntrack_irc_init);
312module_exit(fini); 312module_exit(ip_conntrack_irc_fini);
diff --git a/net/ipv4/netfilter/ip_conntrack_netbios_ns.c b/net/ipv4/netfilter/ip_conntrack_netbios_ns.c
index 4e68e16a2612..a566a81325b2 100644
--- a/net/ipv4/netfilter/ip_conntrack_netbios_ns.c
+++ b/net/ipv4/netfilter/ip_conntrack_netbios_ns.c
@@ -127,16 +127,16 @@ static struct ip_conntrack_helper helper = {
127 .help = help, 127 .help = help,
128}; 128};
129 129
130static int __init init(void) 130static int __init ip_conntrack_netbios_ns_init(void)
131{ 131{
132 helper.timeout = timeout; 132 helper.timeout = timeout;
133 return ip_conntrack_helper_register(&helper); 133 return ip_conntrack_helper_register(&helper);
134} 134}
135 135
136static void __exit fini(void) 136static void __exit ip_conntrack_netbios_ns_fini(void)
137{ 137{
138 ip_conntrack_helper_unregister(&helper); 138 ip_conntrack_helper_unregister(&helper);
139} 139}
140 140
141module_init(init); 141module_init(ip_conntrack_netbios_ns_init);
142module_exit(fini); 142module_exit(ip_conntrack_netbios_ns_fini);
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
index be602e8aeab0..5259abd0fb42 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
@@ -609,7 +609,7 @@ static ctl_table ip_ct_net_table[] = {
609static struct ctl_table_header *ip_ct_sysctl_header; 609static struct ctl_table_header *ip_ct_sysctl_header;
610#endif 610#endif
611 611
612static int __init init(void) 612static int __init ip_conntrack_proto_sctp_init(void)
613{ 613{
614 int ret; 614 int ret;
615 615
@@ -640,7 +640,7 @@ static int __init init(void)
640 return ret; 640 return ret;
641} 641}
642 642
643static void __exit fini(void) 643static void __exit ip_conntrack_proto_sctp_fini(void)
644{ 644{
645 ip_conntrack_protocol_unregister(&ip_conntrack_protocol_sctp); 645 ip_conntrack_protocol_unregister(&ip_conntrack_protocol_sctp);
646#ifdef CONFIG_SYSCTL 646#ifdef CONFIG_SYSCTL
@@ -649,8 +649,8 @@ static void __exit fini(void)
649 DEBUGP("SCTP conntrack module unloaded\n"); 649 DEBUGP("SCTP conntrack module unloaded\n");
650} 650}
651 651
652module_init(init); 652module_init(ip_conntrack_proto_sctp_init);
653module_exit(fini); 653module_exit(ip_conntrack_proto_sctp_fini);
654 654
655MODULE_LICENSE("GPL"); 655MODULE_LICENSE("GPL");
656MODULE_AUTHOR("Kiran Kumar Immidi"); 656MODULE_AUTHOR("Kiran Kumar Immidi");
diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
index 833fcb4be5e7..52076026db36 100644
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -929,18 +929,18 @@ void ip_conntrack_protocol_unregister(struct ip_conntrack_protocol *proto)
929 ip_ct_iterate_cleanup(kill_proto, &proto->proto); 929 ip_ct_iterate_cleanup(kill_proto, &proto->proto);
930} 930}
931 931
932static int __init init(void) 932static int __init ip_conntrack_standalone_init(void)
933{ 933{
934 return init_or_cleanup(1); 934 return init_or_cleanup(1);
935} 935}
936 936
937static void __exit fini(void) 937static void __exit ip_conntrack_standalone_fini(void)
938{ 938{
939 init_or_cleanup(0); 939 init_or_cleanup(0);
940} 940}
941 941
942module_init(init); 942module_init(ip_conntrack_standalone_init);
943module_exit(fini); 943module_exit(ip_conntrack_standalone_fini);
944 944
945/* Some modules need us, but don't depend directly on any symbol. 945/* Some modules need us, but don't depend directly on any symbol.
946 They should call this. */ 946 They should call this. */
diff --git a/net/ipv4/netfilter/ip_conntrack_tftp.c b/net/ipv4/netfilter/ip_conntrack_tftp.c
index 4ba4463cec28..7e33d3bed5e3 100644
--- a/net/ipv4/netfilter/ip_conntrack_tftp.c
+++ b/net/ipv4/netfilter/ip_conntrack_tftp.c
@@ -103,7 +103,7 @@ static int tftp_help(struct sk_buff **pskb,
103static struct ip_conntrack_helper tftp[MAX_PORTS]; 103static struct ip_conntrack_helper tftp[MAX_PORTS];
104static char tftp_names[MAX_PORTS][sizeof("tftp-65535")]; 104static char tftp_names[MAX_PORTS][sizeof("tftp-65535")];
105 105
106static void fini(void) 106static void ip_conntrack_tftp_fini(void)
107{ 107{
108 int i; 108 int i;
109 109
@@ -114,7 +114,7 @@ static void fini(void)
114 } 114 }
115} 115}
116 116
117static int __init init(void) 117static int __init ip_conntrack_tftp_init(void)
118{ 118{
119 int i, ret; 119 int i, ret;
120 char *tmpname; 120 char *tmpname;
@@ -148,12 +148,12 @@ static int __init init(void)
148 if (ret) { 148 if (ret) {
149 printk("ERROR registering helper for port %d\n", 149 printk("ERROR registering helper for port %d\n",
150 ports[i]); 150 ports[i]);
151 fini(); 151 ip_conntrack_tftp_fini();
152 return(ret); 152 return(ret);
153 } 153 }
154 } 154 }
155 return(0); 155 return(0);
156} 156}
157 157
158module_init(init); 158module_init(ip_conntrack_tftp_init);
159module_exit(fini); 159module_exit(ip_conntrack_tftp_fini);
diff --git a/net/ipv4/netfilter/ip_nat_amanda.c b/net/ipv4/netfilter/ip_nat_amanda.c
index 706c8074f422..3a888715bbf3 100644
--- a/net/ipv4/netfilter/ip_nat_amanda.c
+++ b/net/ipv4/netfilter/ip_nat_amanda.c
@@ -68,19 +68,19 @@ static unsigned int help(struct sk_buff **pskb,
68 return ret; 68 return ret;
69} 69}
70 70
71static void __exit fini(void) 71static void __exit ip_nat_amanda_fini(void)
72{ 72{
73 ip_nat_amanda_hook = NULL; 73 ip_nat_amanda_hook = NULL;
74 /* Make sure noone calls it, meanwhile. */ 74 /* Make sure noone calls it, meanwhile. */
75 synchronize_net(); 75 synchronize_net();
76} 76}
77 77
78static int __init init(void) 78static int __init ip_nat_amanda_init(void)
79{ 79{
80 BUG_ON(ip_nat_amanda_hook); 80 BUG_ON(ip_nat_amanda_hook);
81 ip_nat_amanda_hook = help; 81 ip_nat_amanda_hook = help;
82 return 0; 82 return 0;
83} 83}
84 84
85module_init(init); 85module_init(ip_nat_amanda_init);
86module_exit(fini); 86module_exit(ip_nat_amanda_fini);
diff --git a/net/ipv4/netfilter/ip_nat_ftp.c b/net/ipv4/netfilter/ip_nat_ftp.c
index b8daab3c64af..3328fc5c5f50 100644
--- a/net/ipv4/netfilter/ip_nat_ftp.c
+++ b/net/ipv4/netfilter/ip_nat_ftp.c
@@ -154,14 +154,14 @@ static unsigned int ip_nat_ftp(struct sk_buff **pskb,
154 return NF_ACCEPT; 154 return NF_ACCEPT;
155} 155}
156 156
157static void __exit fini(void) 157static void __exit ip_nat_ftp_fini(void)
158{ 158{
159 ip_nat_ftp_hook = NULL; 159 ip_nat_ftp_hook = NULL;
160 /* Make sure noone calls it, meanwhile. */ 160 /* Make sure noone calls it, meanwhile. */
161 synchronize_net(); 161 synchronize_net();
162} 162}
163 163
164static int __init init(void) 164static int __init ip_nat_ftp_init(void)
165{ 165{
166 BUG_ON(ip_nat_ftp_hook); 166 BUG_ON(ip_nat_ftp_hook);
167 ip_nat_ftp_hook = ip_nat_ftp; 167 ip_nat_ftp_hook = ip_nat_ftp;
@@ -177,5 +177,5 @@ static int warn_set(const char *val, struct kernel_param *kp)
177} 177}
178module_param_call(ports, warn_set, NULL, NULL, 0); 178module_param_call(ports, warn_set, NULL, NULL, 0);
179 179
180module_init(init); 180module_init(ip_nat_ftp_init);
181module_exit(fini); 181module_exit(ip_nat_ftp_fini);
diff --git a/net/ipv4/netfilter/ip_nat_helper_pptp.c b/net/ipv4/netfilter/ip_nat_helper_pptp.c
index b9c016c063b8..f3977726ff09 100644
--- a/net/ipv4/netfilter/ip_nat_helper_pptp.c
+++ b/net/ipv4/netfilter/ip_nat_helper_pptp.c
@@ -370,7 +370,7 @@ pptp_inbound_pkt(struct sk_buff **pskb,
370extern int __init ip_nat_proto_gre_init(void); 370extern int __init ip_nat_proto_gre_init(void);
371extern void __exit ip_nat_proto_gre_fini(void); 371extern void __exit ip_nat_proto_gre_fini(void);
372 372
373static int __init init(void) 373static int __init ip_nat_helper_pptp_init(void)
374{ 374{
375 int ret; 375 int ret;
376 376
@@ -396,7 +396,7 @@ static int __init init(void)
396 return 0; 396 return 0;
397} 397}
398 398
399static void __exit fini(void) 399static void __exit ip_nat_helper_pptp_fini(void)
400{ 400{
401 DEBUGP("cleanup_module\n" ); 401 DEBUGP("cleanup_module\n" );
402 402
@@ -412,5 +412,5 @@ static void __exit fini(void)
412 printk("ip_nat_pptp version %s unloaded\n", IP_NAT_PPTP_VERSION); 412 printk("ip_nat_pptp version %s unloaded\n", IP_NAT_PPTP_VERSION);
413} 413}
414 414
415module_init(init); 415module_init(ip_nat_helper_pptp_init);
416module_exit(fini); 416module_exit(ip_nat_helper_pptp_fini);
diff --git a/net/ipv4/netfilter/ip_nat_irc.c b/net/ipv4/netfilter/ip_nat_irc.c
index 461c833eaca1..a767123e082c 100644
--- a/net/ipv4/netfilter/ip_nat_irc.c
+++ b/net/ipv4/netfilter/ip_nat_irc.c
@@ -96,14 +96,14 @@ static unsigned int help(struct sk_buff **pskb,
96 return ret; 96 return ret;
97} 97}
98 98
99static void __exit fini(void) 99static void __exit ip_nat_irc_fini(void)
100{ 100{
101 ip_nat_irc_hook = NULL; 101 ip_nat_irc_hook = NULL;
102 /* Make sure noone calls it, meanwhile. */ 102 /* Make sure noone calls it, meanwhile. */
103 synchronize_net(); 103 synchronize_net();
104} 104}
105 105
106static int __init init(void) 106static int __init ip_nat_irc_init(void)
107{ 107{
108 BUG_ON(ip_nat_irc_hook); 108 BUG_ON(ip_nat_irc_hook);
109 ip_nat_irc_hook = help; 109 ip_nat_irc_hook = help;
@@ -119,5 +119,5 @@ static int warn_set(const char *val, struct kernel_param *kp)
119} 119}
120module_param_call(ports, warn_set, NULL, NULL, 0); 120module_param_call(ports, warn_set, NULL, NULL, 0);
121 121
122module_init(init); 122module_init(ip_nat_irc_init);
123module_exit(fini); 123module_exit(ip_nat_irc_fini);
diff --git a/net/ipv4/netfilter/ip_nat_snmp_basic.c b/net/ipv4/netfilter/ip_nat_snmp_basic.c
index f029da2a60ee..c62253845538 100644
--- a/net/ipv4/netfilter/ip_nat_snmp_basic.c
+++ b/net/ipv4/netfilter/ip_nat_snmp_basic.c
@@ -1324,7 +1324,7 @@ static struct ip_conntrack_helper snmp_trap_helper = {
1324 * 1324 *
1325 *****************************************************************************/ 1325 *****************************************************************************/
1326 1326
1327static int __init init(void) 1327static int __init ip_nat_snmp_basic_init(void)
1328{ 1328{
1329 int ret = 0; 1329 int ret = 0;
1330 1330
@@ -1339,13 +1339,13 @@ static int __init init(void)
1339 return ret; 1339 return ret;
1340} 1340}
1341 1341
1342static void __exit fini(void) 1342static void __exit ip_nat_snmp_basic_fini(void)
1343{ 1343{
1344 ip_conntrack_helper_unregister(&snmp_helper); 1344 ip_conntrack_helper_unregister(&snmp_helper);
1345 ip_conntrack_helper_unregister(&snmp_trap_helper); 1345 ip_conntrack_helper_unregister(&snmp_trap_helper);
1346} 1346}
1347 1347
1348module_init(init); 1348module_init(ip_nat_snmp_basic_init);
1349module_exit(fini); 1349module_exit(ip_nat_snmp_basic_fini);
1350 1350
1351module_param(debug, bool, 0600); 1351module_param(debug, bool, 0600);
diff --git a/net/ipv4/netfilter/ip_nat_standalone.c b/net/ipv4/netfilter/ip_nat_standalone.c
index 380aef3d7865..3505b0de2e04 100644
--- a/net/ipv4/netfilter/ip_nat_standalone.c
+++ b/net/ipv4/netfilter/ip_nat_standalone.c
@@ -425,17 +425,17 @@ static int init_or_cleanup(int init)
425 return ret; 425 return ret;
426} 426}
427 427
428static int __init init(void) 428static int __init ip_nat_standalone_init(void)
429{ 429{
430 return init_or_cleanup(1); 430 return init_or_cleanup(1);
431} 431}
432 432
433static void __exit fini(void) 433static void __exit ip_nat_standalone_fini(void)
434{ 434{
435 init_or_cleanup(0); 435 init_or_cleanup(0);
436} 436}
437 437
438module_init(init); 438module_init(ip_nat_standalone_init);
439module_exit(fini); 439module_exit(ip_nat_standalone_fini);
440 440
441MODULE_LICENSE("GPL"); 441MODULE_LICENSE("GPL");
diff --git a/net/ipv4/netfilter/ip_nat_tftp.c b/net/ipv4/netfilter/ip_nat_tftp.c
index 43c3bd7c118e..94a78015451c 100644
--- a/net/ipv4/netfilter/ip_nat_tftp.c
+++ b/net/ipv4/netfilter/ip_nat_tftp.c
@@ -53,19 +53,19 @@ static unsigned int help(struct sk_buff **pskb,
53 return NF_ACCEPT; 53 return NF_ACCEPT;
54} 54}
55 55
56static void __exit fini(void) 56static void __exit ip_nat_tftp_fini(void)
57{ 57{
58 ip_nat_tftp_hook = NULL; 58 ip_nat_tftp_hook = NULL;
59 /* Make sure noone calls it, meanwhile. */ 59 /* Make sure noone calls it, meanwhile. */
60 synchronize_net(); 60 synchronize_net();
61} 61}
62 62
63static int __init init(void) 63static int __init ip_nat_tftp_init(void)
64{ 64{
65 BUG_ON(ip_nat_tftp_hook); 65 BUG_ON(ip_nat_tftp_hook);
66 ip_nat_tftp_hook = help; 66 ip_nat_tftp_hook = help;
67 return 0; 67 return 0;
68} 68}
69 69
70module_init(init); 70module_init(ip_nat_tftp_init);
71module_exit(fini); 71module_exit(ip_nat_tftp_fini);
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index 1655866c55b9..896a244f8f91 100644
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -717,13 +717,13 @@ cleanup_netlink_notifier:
717 return status; 717 return status;
718} 718}
719 719
720static int __init init(void) 720static int __init ip_queue_init(void)
721{ 721{
722 722
723 return init_or_cleanup(1); 723 return init_or_cleanup(1);
724} 724}
725 725
726static void __exit fini(void) 726static void __exit ip_queue_fini(void)
727{ 727{
728 init_or_cleanup(0); 728 init_or_cleanup(0);
729} 729}
@@ -732,5 +732,5 @@ MODULE_DESCRIPTION("IPv4 packet queue handler");
732MODULE_AUTHOR("James Morris <jmorris@intercode.com.au>"); 732MODULE_AUTHOR("James Morris <jmorris@intercode.com.au>");
733MODULE_LICENSE("GPL"); 733MODULE_LICENSE("GPL");
734 734
735module_init(init); 735module_init(ip_queue_init);
736module_exit(fini); 736module_exit(ip_queue_fini);
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index a7b194c4d79d..460fd905fad0 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -1364,7 +1364,7 @@ static struct ipt_match icmp_matchstruct = {
1364 .checkentry = icmp_checkentry, 1364 .checkentry = icmp_checkentry,
1365}; 1365};
1366 1366
1367static int __init init(void) 1367static int __init ip_tables_init(void)
1368{ 1368{
1369 int ret; 1369 int ret;
1370 1370
@@ -1386,7 +1386,7 @@ static int __init init(void)
1386 return 0; 1386 return 0;
1387} 1387}
1388 1388
1389static void __exit fini(void) 1389static void __exit ip_tables_fini(void)
1390{ 1390{
1391 nf_unregister_sockopt(&ipt_sockopts); 1391 nf_unregister_sockopt(&ipt_sockopts);
1392 1392
@@ -1400,5 +1400,5 @@ static void __exit fini(void)
1400EXPORT_SYMBOL(ipt_register_table); 1400EXPORT_SYMBOL(ipt_register_table);
1401EXPORT_SYMBOL(ipt_unregister_table); 1401EXPORT_SYMBOL(ipt_unregister_table);
1402EXPORT_SYMBOL(ipt_do_table); 1402EXPORT_SYMBOL(ipt_do_table);
1403module_init(init); 1403module_init(ip_tables_init);
1404module_exit(fini); 1404module_exit(ip_tables_fini);
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 61e11edcd6af..e4768a31718b 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -770,15 +770,15 @@ cleanup_none:
770 return -EINVAL; 770 return -EINVAL;
771} 771}
772 772
773static int __init init(void) 773static int __init ipt_clusterip_init(void)
774{ 774{
775 return init_or_cleanup(0); 775 return init_or_cleanup(0);
776} 776}
777 777
778static void __exit fini(void) 778static void __exit ipt_clusterip_fini(void)
779{ 779{
780 init_or_cleanup(1); 780 init_or_cleanup(1);
781} 781}
782 782
783module_init(init); 783module_init(ipt_clusterip_init);
784module_exit(fini); 784module_exit(ipt_clusterip_fini);
diff --git a/net/ipv4/netfilter/ipt_DSCP.c b/net/ipv4/netfilter/ipt_DSCP.c
index cfb0b90e598a..c8e971288dfe 100644
--- a/net/ipv4/netfilter/ipt_DSCP.c
+++ b/net/ipv4/netfilter/ipt_DSCP.c
@@ -82,15 +82,15 @@ static struct ipt_target ipt_dscp_reg = {
82 .me = THIS_MODULE, 82 .me = THIS_MODULE,
83}; 83};
84 84
85static int __init init(void) 85static int __init ipt_dscp_init(void)
86{ 86{
87 return ipt_register_target(&ipt_dscp_reg); 87 return ipt_register_target(&ipt_dscp_reg);
88} 88}
89 89
90static void __exit fini(void) 90static void __exit ipt_dscp_fini(void)
91{ 91{
92 ipt_unregister_target(&ipt_dscp_reg); 92 ipt_unregister_target(&ipt_dscp_reg);
93} 93}
94 94
95module_init(init); 95module_init(ipt_dscp_init);
96module_exit(fini); 96module_exit(ipt_dscp_fini);
diff --git a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/ipt_ECN.c
index b9b80f90c84e..4adf5c9d34f5 100644
--- a/net/ipv4/netfilter/ipt_ECN.c
+++ b/net/ipv4/netfilter/ipt_ECN.c
@@ -151,15 +151,15 @@ static struct ipt_target ipt_ecn_reg = {
151 .me = THIS_MODULE, 151 .me = THIS_MODULE,
152}; 152};
153 153
154static int __init init(void) 154static int __init ipt_ecn_init(void)
155{ 155{
156 return ipt_register_target(&ipt_ecn_reg); 156 return ipt_register_target(&ipt_ecn_reg);
157} 157}
158 158
159static void __exit fini(void) 159static void __exit ipt_ecn_fini(void)
160{ 160{
161 ipt_unregister_target(&ipt_ecn_reg); 161 ipt_unregister_target(&ipt_ecn_reg);
162} 162}
163 163
164module_init(init); 164module_init(ipt_ecn_init);
165module_exit(fini); 165module_exit(ipt_ecn_fini);
diff --git a/net/ipv4/netfilter/ipt_LOG.c b/net/ipv4/netfilter/ipt_LOG.c
index 750d3221b280..39fd4c2a2386 100644
--- a/net/ipv4/netfilter/ipt_LOG.c
+++ b/net/ipv4/netfilter/ipt_LOG.c
@@ -471,7 +471,7 @@ static struct nf_logger ipt_log_logger ={
471 .me = THIS_MODULE, 471 .me = THIS_MODULE,
472}; 472};
473 473
474static int __init init(void) 474static int __init ipt_log_init(void)
475{ 475{
476 if (ipt_register_target(&ipt_log_reg)) 476 if (ipt_register_target(&ipt_log_reg))
477 return -EINVAL; 477 return -EINVAL;
@@ -485,11 +485,11 @@ static int __init init(void)
485 return 0; 485 return 0;
486} 486}
487 487
488static void __exit fini(void) 488static void __exit ipt_log_fini(void)
489{ 489{
490 nf_log_unregister_logger(&ipt_log_logger); 490 nf_log_unregister_logger(&ipt_log_logger);
491 ipt_unregister_target(&ipt_log_reg); 491 ipt_unregister_target(&ipt_log_reg);
492} 492}
493 493
494module_init(init); 494module_init(ipt_log_init);
495module_exit(fini); 495module_exit(ipt_log_fini);
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c
index e0c321c3bae5..8b3e7f99b861 100644
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -175,7 +175,7 @@ static struct ipt_target masquerade = {
175 .me = THIS_MODULE, 175 .me = THIS_MODULE,
176}; 176};
177 177
178static int __init init(void) 178static int __init ipt_masquerade_init(void)
179{ 179{
180 int ret; 180 int ret;
181 181
@@ -191,12 +191,12 @@ static int __init init(void)
191 return ret; 191 return ret;
192} 192}
193 193
194static void __exit fini(void) 194static void __exit ipt_masquerade_fini(void)
195{ 195{
196 ipt_unregister_target(&masquerade); 196 ipt_unregister_target(&masquerade);
197 unregister_netdevice_notifier(&masq_dev_notifier); 197 unregister_netdevice_notifier(&masq_dev_notifier);
198 unregister_inetaddr_notifier(&masq_inet_notifier); 198 unregister_inetaddr_notifier(&masq_inet_notifier);
199} 199}
200 200
201module_init(init); 201module_init(ipt_masquerade_init);
202module_exit(fini); 202module_exit(ipt_masquerade_fini);
diff --git a/net/ipv4/netfilter/ipt_NETMAP.c b/net/ipv4/netfilter/ipt_NETMAP.c
index fba181c2a426..2fcf1075b027 100644
--- a/net/ipv4/netfilter/ipt_NETMAP.c
+++ b/net/ipv4/netfilter/ipt_NETMAP.c
@@ -98,15 +98,15 @@ static struct ipt_target target_module = {
98 .me = THIS_MODULE 98 .me = THIS_MODULE
99}; 99};
100 100
101static int __init init(void) 101static int __init ipt_netmap_init(void)
102{ 102{
103 return ipt_register_target(&target_module); 103 return ipt_register_target(&target_module);
104} 104}
105 105
106static void __exit fini(void) 106static void __exit ipt_netmap_fini(void)
107{ 107{
108 ipt_unregister_target(&target_module); 108 ipt_unregister_target(&target_module);
109} 109}
110 110
111module_init(init); 111module_init(ipt_netmap_init);
112module_exit(fini); 112module_exit(ipt_netmap_fini);
diff --git a/net/ipv4/netfilter/ipt_REDIRECT.c b/net/ipv4/netfilter/ipt_REDIRECT.c
index be3da7c4b871..f290463232de 100644
--- a/net/ipv4/netfilter/ipt_REDIRECT.c
+++ b/net/ipv4/netfilter/ipt_REDIRECT.c
@@ -112,15 +112,15 @@ static struct ipt_target redirect_reg = {
112 .me = THIS_MODULE, 112 .me = THIS_MODULE,
113}; 113};
114 114
115static int __init init(void) 115static int __init ipt_redirect_init(void)
116{ 116{
117 return ipt_register_target(&redirect_reg); 117 return ipt_register_target(&redirect_reg);
118} 118}
119 119
120static void __exit fini(void) 120static void __exit ipt_redirect_fini(void)
121{ 121{
122 ipt_unregister_target(&redirect_reg); 122 ipt_unregister_target(&redirect_reg);
123} 123}
124 124
125module_init(init); 125module_init(ipt_redirect_init);
126module_exit(fini); 126module_exit(ipt_redirect_fini);
diff --git a/net/ipv4/netfilter/ipt_REJECT.c b/net/ipv4/netfilter/ipt_REJECT.c
index 9d3b3579f27c..4269a5440d43 100644
--- a/net/ipv4/netfilter/ipt_REJECT.c
+++ b/net/ipv4/netfilter/ipt_REJECT.c
@@ -313,15 +313,15 @@ static struct ipt_target ipt_reject_reg = {
313 .me = THIS_MODULE, 313 .me = THIS_MODULE,
314}; 314};
315 315
316static int __init init(void) 316static int __init ipt_reject_init(void)
317{ 317{
318 return ipt_register_target(&ipt_reject_reg); 318 return ipt_register_target(&ipt_reject_reg);
319} 319}
320 320
321static void __exit fini(void) 321static void __exit ipt_reject_fini(void)
322{ 322{
323 ipt_unregister_target(&ipt_reject_reg); 323 ipt_unregister_target(&ipt_reject_reg);
324} 324}
325 325
326module_init(init); 326module_init(ipt_reject_init);
327module_exit(fini); 327module_exit(ipt_reject_fini);
diff --git a/net/ipv4/netfilter/ipt_SAME.c b/net/ipv4/netfilter/ipt_SAME.c
index 7e2ebc9d945e..7169b09b5a67 100644
--- a/net/ipv4/netfilter/ipt_SAME.c
+++ b/net/ipv4/netfilter/ipt_SAME.c
@@ -189,16 +189,16 @@ static struct ipt_target same_reg = {
189 .me = THIS_MODULE, 189 .me = THIS_MODULE,
190}; 190};
191 191
192static int __init init(void) 192static int __init ipt_same_init(void)
193{ 193{
194 return ipt_register_target(&same_reg); 194 return ipt_register_target(&same_reg);
195} 195}
196 196
197static void __exit fini(void) 197static void __exit ipt_same_fini(void)
198{ 198{
199 ipt_unregister_target(&same_reg); 199 ipt_unregister_target(&same_reg);
200} 200}
201 201
202module_init(init); 202module_init(ipt_same_init);
203module_exit(fini); 203module_exit(ipt_same_fini);
204 204
diff --git a/net/ipv4/netfilter/ipt_TCPMSS.c b/net/ipv4/netfilter/ipt_TCPMSS.c
index c4fc50ec2ddb..ef2fe5b3f0d8 100644
--- a/net/ipv4/netfilter/ipt_TCPMSS.c
+++ b/net/ipv4/netfilter/ipt_TCPMSS.c
@@ -243,15 +243,15 @@ static struct ipt_target ipt_tcpmss_reg = {
243 .me = THIS_MODULE, 243 .me = THIS_MODULE,
244}; 244};
245 245
246static int __init init(void) 246static int __init ipt_tcpmss_init(void)
247{ 247{
248 return ipt_register_target(&ipt_tcpmss_reg); 248 return ipt_register_target(&ipt_tcpmss_reg);
249} 249}
250 250
251static void __exit fini(void) 251static void __exit ipt_tcpmss_fini(void)
252{ 252{
253 ipt_unregister_target(&ipt_tcpmss_reg); 253 ipt_unregister_target(&ipt_tcpmss_reg);
254} 254}
255 255
256module_init(init); 256module_init(ipt_tcpmss_init);
257module_exit(fini); 257module_exit(ipt_tcpmss_fini);
diff --git a/net/ipv4/netfilter/ipt_TOS.c b/net/ipv4/netfilter/ipt_TOS.c
index 9aa7817657f0..1c7a5ca399b3 100644
--- a/net/ipv4/netfilter/ipt_TOS.c
+++ b/net/ipv4/netfilter/ipt_TOS.c
@@ -81,15 +81,15 @@ static struct ipt_target ipt_tos_reg = {
81 .me = THIS_MODULE, 81 .me = THIS_MODULE,
82}; 82};
83 83
84static int __init init(void) 84static int __init ipt_tos_init(void)
85{ 85{
86 return ipt_register_target(&ipt_tos_reg); 86 return ipt_register_target(&ipt_tos_reg);
87} 87}
88 88
89static void __exit fini(void) 89static void __exit ipt_tos_fini(void)
90{ 90{
91 ipt_unregister_target(&ipt_tos_reg); 91 ipt_unregister_target(&ipt_tos_reg);
92} 92}
93 93
94module_init(init); 94module_init(ipt_tos_init);
95module_exit(fini); 95module_exit(ipt_tos_fini);
diff --git a/net/ipv4/netfilter/ipt_TTL.c b/net/ipv4/netfilter/ipt_TTL.c
index 5009a003d578..f48892ae0be5 100644
--- a/net/ipv4/netfilter/ipt_TTL.c
+++ b/net/ipv4/netfilter/ipt_TTL.c
@@ -94,15 +94,15 @@ static struct ipt_target ipt_TTL = {
94 .me = THIS_MODULE, 94 .me = THIS_MODULE,
95}; 95};
96 96
97static int __init init(void) 97static int __init ipt_ttl_init(void)
98{ 98{
99 return ipt_register_target(&ipt_TTL); 99 return ipt_register_target(&ipt_TTL);
100} 100}
101 101
102static void __exit fini(void) 102static void __exit ipt_ttl_fini(void)
103{ 103{
104 ipt_unregister_target(&ipt_TTL); 104 ipt_unregister_target(&ipt_TTL);
105} 105}
106 106
107module_init(init); 107module_init(ipt_ttl_init);
108module_exit(fini); 108module_exit(ipt_ttl_fini);
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index a82a32ed0e2f..c84cc03389d8 100644
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -374,7 +374,7 @@ static struct nf_logger ipt_ulog_logger = {
374 .me = THIS_MODULE, 374 .me = THIS_MODULE,
375}; 375};
376 376
377static int __init init(void) 377static int __init ipt_ulog_init(void)
378{ 378{
379 int i; 379 int i;
380 380
@@ -407,7 +407,7 @@ static int __init init(void)
407 return 0; 407 return 0;
408} 408}
409 409
410static void __exit fini(void) 410static void __exit ipt_ulog_fini(void)
411{ 411{
412 ulog_buff_t *ub; 412 ulog_buff_t *ub;
413 int i; 413 int i;
@@ -435,5 +435,5 @@ static void __exit fini(void)
435 435
436} 436}
437 437
438module_init(init); 438module_init(ipt_ulog_init);
439module_exit(fini); 439module_exit(ipt_ulog_fini);
diff --git a/net/ipv4/netfilter/ipt_addrtype.c b/net/ipv4/netfilter/ipt_addrtype.c
index 5fdf85d0efcf..893dae210b04 100644
--- a/net/ipv4/netfilter/ipt_addrtype.c
+++ b/net/ipv4/netfilter/ipt_addrtype.c
@@ -51,15 +51,15 @@ static struct ipt_match addrtype_match = {
51 .me = THIS_MODULE 51 .me = THIS_MODULE
52}; 52};
53 53
54static int __init init(void) 54static int __init ipt_addrtype_init(void)
55{ 55{
56 return ipt_register_match(&addrtype_match); 56 return ipt_register_match(&addrtype_match);
57} 57}
58 58
59static void __exit fini(void) 59static void __exit ipt_addrtype_fini(void)
60{ 60{
61 ipt_unregister_match(&addrtype_match); 61 ipt_unregister_match(&addrtype_match);
62} 62}
63 63
64module_init(init); 64module_init(ipt_addrtype_init);
65module_exit(fini); 65module_exit(ipt_addrtype_fini);
diff --git a/net/ipv4/netfilter/ipt_ah.c b/net/ipv4/netfilter/ipt_ah.c
index 35a21fb1f8e0..2927135873d7 100644
--- a/net/ipv4/netfilter/ipt_ah.c
+++ b/net/ipv4/netfilter/ipt_ah.c
@@ -96,15 +96,15 @@ static struct ipt_match ah_match = {
96 .me = THIS_MODULE, 96 .me = THIS_MODULE,
97}; 97};
98 98
99static int __init init(void) 99static int __init ipt_ah_init(void)
100{ 100{
101 return ipt_register_match(&ah_match); 101 return ipt_register_match(&ah_match);
102} 102}
103 103
104static void __exit cleanup(void) 104static void __exit ipt_ah_fini(void)
105{ 105{
106 ipt_unregister_match(&ah_match); 106 ipt_unregister_match(&ah_match);
107} 107}
108 108
109module_init(init); 109module_init(ipt_ah_init);
110module_exit(cleanup); 110module_exit(ipt_ah_fini);
diff --git a/net/ipv4/netfilter/ipt_dscp.c b/net/ipv4/netfilter/ipt_dscp.c
index 11963c385dea..47177591aeb6 100644
--- a/net/ipv4/netfilter/ipt_dscp.c
+++ b/net/ipv4/netfilter/ipt_dscp.c
@@ -39,16 +39,16 @@ static struct ipt_match dscp_match = {
39 .me = THIS_MODULE, 39 .me = THIS_MODULE,
40}; 40};
41 41
42static int __init init(void) 42static int __init ipt_dscp_init(void)
43{ 43{
44 return ipt_register_match(&dscp_match); 44 return ipt_register_match(&dscp_match);
45} 45}
46 46
47static void __exit fini(void) 47static void __exit ipt_dscp_fini(void)
48{ 48{
49 ipt_unregister_match(&dscp_match); 49 ipt_unregister_match(&dscp_match);
50 50
51} 51}
52 52
53module_init(init); 53module_init(ipt_dscp_init);
54module_exit(fini); 54module_exit(ipt_dscp_fini);
diff --git a/net/ipv4/netfilter/ipt_ecn.c b/net/ipv4/netfilter/ipt_ecn.c
index d7e29f6a38d8..b28250414933 100644
--- a/net/ipv4/netfilter/ipt_ecn.c
+++ b/net/ipv4/netfilter/ipt_ecn.c
@@ -118,15 +118,15 @@ static struct ipt_match ecn_match = {
118 .me = THIS_MODULE, 118 .me = THIS_MODULE,
119}; 119};
120 120
121static int __init init(void) 121static int __init ipt_ecn_init(void)
122{ 122{
123 return ipt_register_match(&ecn_match); 123 return ipt_register_match(&ecn_match);
124} 124}
125 125
126static void __exit fini(void) 126static void __exit ipt_ecn_fini(void)
127{ 127{
128 ipt_unregister_match(&ecn_match); 128 ipt_unregister_match(&ecn_match);
129} 129}
130 130
131module_init(init); 131module_init(ipt_ecn_init);
132module_exit(fini); 132module_exit(ipt_ecn_fini);
diff --git a/net/ipv4/netfilter/ipt_esp.c b/net/ipv4/netfilter/ipt_esp.c
index af0d5ec79cb5..3840b417a3c5 100644
--- a/net/ipv4/netfilter/ipt_esp.c
+++ b/net/ipv4/netfilter/ipt_esp.c
@@ -97,15 +97,15 @@ static struct ipt_match esp_match = {
97 .me = THIS_MODULE, 97 .me = THIS_MODULE,
98}; 98};
99 99
100static int __init init(void) 100static int __init ipt_esp_init(void)
101{ 101{
102 return ipt_register_match(&esp_match); 102 return ipt_register_match(&esp_match);
103} 103}
104 104
105static void __exit cleanup(void) 105static void __exit ipt_esp_fini(void)
106{ 106{
107 ipt_unregister_match(&esp_match); 107 ipt_unregister_match(&esp_match);
108} 108}
109 109
110module_init(init); 110module_init(ipt_esp_init);
111module_exit(cleanup); 111module_exit(ipt_esp_fini);
diff --git a/net/ipv4/netfilter/ipt_hashlimit.c b/net/ipv4/netfilter/ipt_hashlimit.c
index ba5e23505e88..7c6836c4646e 100644
--- a/net/ipv4/netfilter/ipt_hashlimit.c
+++ b/net/ipv4/netfilter/ipt_hashlimit.c
@@ -719,15 +719,15 @@ cleanup_nothing:
719 719
720} 720}
721 721
722static int __init init(void) 722static int __init ipt_hashlimit_init(void)
723{ 723{
724 return init_or_fini(0); 724 return init_or_fini(0);
725} 725}
726 726
727static void __exit fini(void) 727static void __exit ipt_hashlimit_fini(void)
728{ 728{
729 init_or_fini(1); 729 init_or_fini(1);
730} 730}
731 731
732module_init(init); 732module_init(ipt_hashlimit_init);
733module_exit(fini); 733module_exit(ipt_hashlimit_fini);
diff --git a/net/ipv4/netfilter/ipt_iprange.c b/net/ipv4/netfilter/ipt_iprange.c
index ae70112f5e06..5202edd8d333 100644
--- a/net/ipv4/netfilter/ipt_iprange.c
+++ b/net/ipv4/netfilter/ipt_iprange.c
@@ -71,15 +71,15 @@ static struct ipt_match iprange_match = {
71 .me = THIS_MODULE 71 .me = THIS_MODULE
72}; 72};
73 73
74static int __init init(void) 74static int __init ipt_iprange_init(void)
75{ 75{
76 return ipt_register_match(&iprange_match); 76 return ipt_register_match(&iprange_match);
77} 77}
78 78
79static void __exit fini(void) 79static void __exit ipt_iprange_fini(void)
80{ 80{
81 ipt_unregister_match(&iprange_match); 81 ipt_unregister_match(&iprange_match);
82} 82}
83 83
84module_init(init); 84module_init(ipt_iprange_init);
85module_exit(fini); 85module_exit(ipt_iprange_fini);
diff --git a/net/ipv4/netfilter/ipt_multiport.c b/net/ipv4/netfilter/ipt_multiport.c
index bd07f7c53872..ac95d8390bcc 100644
--- a/net/ipv4/netfilter/ipt_multiport.c
+++ b/net/ipv4/netfilter/ipt_multiport.c
@@ -171,7 +171,7 @@ static struct ipt_match multiport_match_v1 = {
171 .me = THIS_MODULE, 171 .me = THIS_MODULE,
172}; 172};
173 173
174static int __init init(void) 174static int __init ipt_multiport_init(void)
175{ 175{
176 int err; 176 int err;
177 177
@@ -185,11 +185,11 @@ static int __init init(void)
185 return err; 185 return err;
186} 186}
187 187
188static void __exit fini(void) 188static void __exit ipt_multiport_fini(void)
189{ 189{
190 ipt_unregister_match(&multiport_match); 190 ipt_unregister_match(&multiport_match);
191 ipt_unregister_match(&multiport_match_v1); 191 ipt_unregister_match(&multiport_match_v1);
192} 192}
193 193
194module_init(init); 194module_init(ipt_multiport_init);
195module_exit(fini); 195module_exit(ipt_multiport_fini);
diff --git a/net/ipv4/netfilter/ipt_owner.c b/net/ipv4/netfilter/ipt_owner.c
index 3900428771f3..5ac6ac023b5e 100644
--- a/net/ipv4/netfilter/ipt_owner.c
+++ b/net/ipv4/netfilter/ipt_owner.c
@@ -78,15 +78,15 @@ static struct ipt_match owner_match = {
78 .me = THIS_MODULE, 78 .me = THIS_MODULE,
79}; 79};
80 80
81static int __init init(void) 81static int __init ipt_owner_init(void)
82{ 82{
83 return ipt_register_match(&owner_match); 83 return ipt_register_match(&owner_match);
84} 84}
85 85
86static void __exit fini(void) 86static void __exit ipt_owner_fini(void)
87{ 87{
88 ipt_unregister_match(&owner_match); 88 ipt_unregister_match(&owner_match);
89} 89}
90 90
91module_init(init); 91module_init(ipt_owner_init);
92module_exit(fini); 92module_exit(ipt_owner_fini);
diff --git a/net/ipv4/netfilter/ipt_recent.c b/net/ipv4/netfilter/ipt_recent.c
index 06792ead1da4..143843285702 100644
--- a/net/ipv4/netfilter/ipt_recent.c
+++ b/net/ipv4/netfilter/ipt_recent.c
@@ -962,7 +962,7 @@ static struct ipt_match recent_match = {
962}; 962};
963 963
964/* Kernel module initialization. */ 964/* Kernel module initialization. */
965static int __init init(void) 965static int __init ipt_recent_init(void)
966{ 966{
967 int err, count; 967 int err, count;
968 968
@@ -995,7 +995,7 @@ static int __init init(void)
995} 995}
996 996
997/* Kernel module destruction. */ 997/* Kernel module destruction. */
998static void __exit fini(void) 998static void __exit ipt_recent_fini(void)
999{ 999{
1000 ipt_unregister_match(&recent_match); 1000 ipt_unregister_match(&recent_match);
1001 1001
@@ -1003,5 +1003,5 @@ static void __exit fini(void)
1003} 1003}
1004 1004
1005/* Register our module with the kernel. */ 1005/* Register our module with the kernel. */
1006module_init(init); 1006module_init(ipt_recent_init);
1007module_exit(fini); 1007module_exit(ipt_recent_fini);
diff --git a/net/ipv4/netfilter/ipt_tos.c b/net/ipv4/netfilter/ipt_tos.c
index e404e92ddd01..5549c39c7851 100644
--- a/net/ipv4/netfilter/ipt_tos.c
+++ b/net/ipv4/netfilter/ipt_tos.c
@@ -39,15 +39,15 @@ static struct ipt_match tos_match = {
39 .me = THIS_MODULE, 39 .me = THIS_MODULE,
40}; 40};
41 41
42static int __init init(void) 42static int __init ipt_multiport_init(void)
43{ 43{
44 return ipt_register_match(&tos_match); 44 return ipt_register_match(&tos_match);
45} 45}
46 46
47static void __exit fini(void) 47static void __exit ipt_multiport_fini(void)
48{ 48{
49 ipt_unregister_match(&tos_match); 49 ipt_unregister_match(&tos_match);
50} 50}
51 51
52module_init(init); 52module_init(ipt_multiport_init);
53module_exit(fini); 53module_exit(ipt_multiport_fini);
diff --git a/net/ipv4/netfilter/ipt_ttl.c b/net/ipv4/netfilter/ipt_ttl.c
index ae7ce4d8d90e..a5243bdb87d7 100644
--- a/net/ipv4/netfilter/ipt_ttl.c
+++ b/net/ipv4/netfilter/ipt_ttl.c
@@ -55,16 +55,16 @@ static struct ipt_match ttl_match = {
55 .me = THIS_MODULE, 55 .me = THIS_MODULE,
56}; 56};
57 57
58static int __init init(void) 58static int __init ipt_ttl_init(void)
59{ 59{
60 return ipt_register_match(&ttl_match); 60 return ipt_register_match(&ttl_match);
61} 61}
62 62
63static void __exit fini(void) 63static void __exit ipt_ttl_fini(void)
64{ 64{
65 ipt_unregister_match(&ttl_match); 65 ipt_unregister_match(&ttl_match);
66 66
67} 67}
68 68
69module_init(init); 69module_init(ipt_ttl_init);
70module_exit(fini); 70module_exit(ipt_ttl_fini);
diff --git a/net/ipv4/netfilter/iptable_filter.c b/net/ipv4/netfilter/iptable_filter.c
index 212a3079085b..3d80aefe9cfa 100644
--- a/net/ipv4/netfilter/iptable_filter.c
+++ b/net/ipv4/netfilter/iptable_filter.c
@@ -139,7 +139,7 @@ static struct nf_hook_ops ipt_ops[] = {
139static int forward = NF_ACCEPT; 139static int forward = NF_ACCEPT;
140module_param(forward, bool, 0000); 140module_param(forward, bool, 0000);
141 141
142static int __init init(void) 142static int __init iptable_filter_init(void)
143{ 143{
144 int ret; 144 int ret;
145 145
@@ -181,7 +181,7 @@ static int __init init(void)
181 return ret; 181 return ret;
182} 182}
183 183
184static void __exit fini(void) 184static void __exit iptable_filter_fini(void)
185{ 185{
186 unsigned int i; 186 unsigned int i;
187 187
@@ -191,5 +191,5 @@ static void __exit fini(void)
191 ipt_unregister_table(&packet_filter); 191 ipt_unregister_table(&packet_filter);
192} 192}
193 193
194module_init(init); 194module_init(iptable_filter_init);
195module_exit(fini); 195module_exit(iptable_filter_fini);
diff --git a/net/ipv4/netfilter/iptable_mangle.c b/net/ipv4/netfilter/iptable_mangle.c
index 3212a5cc4b6b..412fc96cc896 100644
--- a/net/ipv4/netfilter/iptable_mangle.c
+++ b/net/ipv4/netfilter/iptable_mangle.c
@@ -201,7 +201,7 @@ static struct nf_hook_ops ipt_ops[] = {
201 }, 201 },
202}; 202};
203 203
204static int __init init(void) 204static int __init iptable_mangle_init(void)
205{ 205{
206 int ret; 206 int ret;
207 207
@@ -247,7 +247,7 @@ static int __init init(void)
247 return ret; 247 return ret;
248} 248}
249 249
250static void __exit fini(void) 250static void __exit iptable_mangle_fini(void)
251{ 251{
252 unsigned int i; 252 unsigned int i;
253 253
@@ -257,5 +257,5 @@ static void __exit fini(void)
257 ipt_unregister_table(&packet_mangler); 257 ipt_unregister_table(&packet_mangler);
258} 258}
259 259
260module_init(init); 260module_init(iptable_mangle_init);
261module_exit(fini); 261module_exit(iptable_mangle_fini);
diff --git a/net/ipv4/netfilter/iptable_raw.c b/net/ipv4/netfilter/iptable_raw.c
index fdb9e9c81e81..03cc79a6160a 100644
--- a/net/ipv4/netfilter/iptable_raw.c
+++ b/net/ipv4/netfilter/iptable_raw.c
@@ -116,7 +116,7 @@ static struct nf_hook_ops ipt_ops[] = {
116 }, 116 },
117}; 117};
118 118
119static int __init init(void) 119static int __init iptable_raw_init(void)
120{ 120{
121 int ret; 121 int ret;
122 122
@@ -144,7 +144,7 @@ static int __init init(void)
144 return ret; 144 return ret;
145} 145}
146 146
147static void __exit fini(void) 147static void __exit iptable_raw_fini(void)
148{ 148{
149 unsigned int i; 149 unsigned int i;
150 150
@@ -154,6 +154,6 @@ static void __exit fini(void)
154 ipt_unregister_table(&packet_raw); 154 ipt_unregister_table(&packet_raw);
155} 155}
156 156
157module_init(init); 157module_init(iptable_raw_init);
158module_exit(fini); 158module_exit(iptable_raw_fini);
159MODULE_LICENSE("GPL"); 159MODULE_LICENSE("GPL");
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index c8abc9d859b9..4afbc699d3ba 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -571,18 +571,18 @@ static int init_or_cleanup(int init)
571MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET)); 571MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET));
572MODULE_LICENSE("GPL"); 572MODULE_LICENSE("GPL");
573 573
574static int __init init(void) 574static int __init nf_conntrack_l3proto_ipv4_init(void)
575{ 575{
576 need_conntrack(); 576 need_conntrack();
577 return init_or_cleanup(1); 577 return init_or_cleanup(1);
578} 578}
579 579
580static void __exit fini(void) 580static void __exit nf_conntrack_l3proto_ipv4_fini(void)
581{ 581{
582 init_or_cleanup(0); 582 init_or_cleanup(0);
583} 583}
584 584
585module_init(init); 585module_init(nf_conntrack_l3proto_ipv4_init);
586module_exit(fini); 586module_exit(nf_conntrack_l3proto_ipv4_fini);
587 587
588EXPORT_SYMBOL(nf_ct_ipv4_gather_frags); 588EXPORT_SYMBOL(nf_ct_ipv4_gather_frags);
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index 344eab3b5da8..e81c6a9dab81 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -713,13 +713,13 @@ cleanup_netlink_notifier:
713 return status; 713 return status;
714} 714}
715 715
716static int __init init(void) 716static int __init ip6_queue_init(void)
717{ 717{
718 718
719 return init_or_cleanup(1); 719 return init_or_cleanup(1);
720} 720}
721 721
722static void __exit fini(void) 722static void __exit ip6_queue_fini(void)
723{ 723{
724 init_or_cleanup(0); 724 init_or_cleanup(0);
725} 725}
@@ -727,5 +727,5 @@ static void __exit fini(void)
727MODULE_DESCRIPTION("IPv6 packet queue handler"); 727MODULE_DESCRIPTION("IPv6 packet queue handler");
728MODULE_LICENSE("GPL"); 728MODULE_LICENSE("GPL");
729 729
730module_init(init); 730module_init(ip6_queue_init);
731module_exit(fini); 731module_exit(ip6_queue_fini);
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index db3c9ae98e95..3ecf2db841f8 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -1406,7 +1406,7 @@ static struct ip6t_match icmp6_matchstruct = {
1406 .family = AF_INET6, 1406 .family = AF_INET6,
1407}; 1407};
1408 1408
1409static int __init init(void) 1409static int __init ip6_tables_init(void)
1410{ 1410{
1411 int ret; 1411 int ret;
1412 1412
@@ -1429,7 +1429,7 @@ static int __init init(void)
1429 return 0; 1429 return 0;
1430} 1430}
1431 1431
1432static void __exit fini(void) 1432static void __exit ip6_tables_fini(void)
1433{ 1433{
1434 nf_unregister_sockopt(&ip6t_sockopts); 1434 nf_unregister_sockopt(&ip6t_sockopts);
1435 xt_unregister_match(&icmp6_matchstruct); 1435 xt_unregister_match(&icmp6_matchstruct);
@@ -1517,5 +1517,5 @@ EXPORT_SYMBOL(ip6t_do_table);
1517EXPORT_SYMBOL(ip6t_ext_hdr); 1517EXPORT_SYMBOL(ip6t_ext_hdr);
1518EXPORT_SYMBOL(ipv6_find_hdr); 1518EXPORT_SYMBOL(ipv6_find_hdr);
1519 1519
1520module_init(init); 1520module_init(ip6_tables_init);
1521module_exit(fini); 1521module_exit(ip6_tables_fini);
diff --git a/net/ipv6/netfilter/ip6t_HL.c b/net/ipv6/netfilter/ip6t_HL.c
index da14c6d86bcc..b8eff8ee69b1 100644
--- a/net/ipv6/netfilter/ip6t_HL.c
+++ b/net/ipv6/netfilter/ip6t_HL.c
@@ -93,15 +93,15 @@ static struct ip6t_target ip6t_HL = {
93 .me = THIS_MODULE 93 .me = THIS_MODULE
94}; 94};
95 95
96static int __init init(void) 96static int __init ip6t_hl_init(void)
97{ 97{
98 return ip6t_register_target(&ip6t_HL); 98 return ip6t_register_target(&ip6t_HL);
99} 99}
100 100
101static void __exit fini(void) 101static void __exit ip6t_hl_fini(void)
102{ 102{
103 ip6t_unregister_target(&ip6t_HL); 103 ip6t_unregister_target(&ip6t_HL);
104} 104}
105 105
106module_init(init); 106module_init(ip6t_hl_init);
107module_exit(fini); 107module_exit(ip6t_hl_fini);
diff --git a/net/ipv6/netfilter/ip6t_LOG.c b/net/ipv6/netfilter/ip6t_LOG.c
index 07c6bcbe4c5f..a96c0de14b00 100644
--- a/net/ipv6/netfilter/ip6t_LOG.c
+++ b/net/ipv6/netfilter/ip6t_LOG.c
@@ -483,7 +483,7 @@ static struct nf_logger ip6t_logger = {
483 .me = THIS_MODULE, 483 .me = THIS_MODULE,
484}; 484};
485 485
486static int __init init(void) 486static int __init ip6t_log_init(void)
487{ 487{
488 if (ip6t_register_target(&ip6t_log_reg)) 488 if (ip6t_register_target(&ip6t_log_reg))
489 return -EINVAL; 489 return -EINVAL;
@@ -497,11 +497,11 @@ static int __init init(void)
497 return 0; 497 return 0;
498} 498}
499 499
500static void __exit fini(void) 500static void __exit ip6t_log_fini(void)
501{ 501{
502 nf_log_unregister_logger(&ip6t_logger); 502 nf_log_unregister_logger(&ip6t_logger);
503 ip6t_unregister_target(&ip6t_log_reg); 503 ip6t_unregister_target(&ip6t_log_reg);
504} 504}
505 505
506module_init(init); 506module_init(ip6t_log_init);
507module_exit(fini); 507module_exit(ip6t_log_fini);
diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c
index ddfa38575fe2..de1175c27f6d 100644
--- a/net/ipv6/netfilter/ip6t_REJECT.c
+++ b/net/ipv6/netfilter/ip6t_REJECT.c
@@ -255,17 +255,17 @@ static struct ip6t_target ip6t_reject_reg = {
255 .me = THIS_MODULE 255 .me = THIS_MODULE
256}; 256};
257 257
258static int __init init(void) 258static int __init ip6t_reject_init(void)
259{ 259{
260 if (ip6t_register_target(&ip6t_reject_reg)) 260 if (ip6t_register_target(&ip6t_reject_reg))
261 return -EINVAL; 261 return -EINVAL;
262 return 0; 262 return 0;
263} 263}
264 264
265static void __exit fini(void) 265static void __exit ip6t_reject_fini(void)
266{ 266{
267 ip6t_unregister_target(&ip6t_reject_reg); 267 ip6t_unregister_target(&ip6t_reject_reg);
268} 268}
269 269
270module_init(init); 270module_init(ip6t_reject_init);
271module_exit(fini); 271module_exit(ip6t_reject_fini);
diff --git a/net/ipv6/netfilter/ip6t_ah.c b/net/ipv6/netfilter/ip6t_ah.c
index 178f6fb1e53d..2f7bb20c758b 100644
--- a/net/ipv6/netfilter/ip6t_ah.c
+++ b/net/ipv6/netfilter/ip6t_ah.c
@@ -122,15 +122,15 @@ static struct ip6t_match ah_match = {
122 .me = THIS_MODULE, 122 .me = THIS_MODULE,
123}; 123};
124 124
125static int __init init(void) 125static int __init ip6t_ah_init(void)
126{ 126{
127 return ip6t_register_match(&ah_match); 127 return ip6t_register_match(&ah_match);
128} 128}
129 129
130static void __exit cleanup(void) 130static void __exit ip6t_ah_fini(void)
131{ 131{
132 ip6t_unregister_match(&ah_match); 132 ip6t_unregister_match(&ah_match);
133} 133}
134 134
135module_init(init); 135module_init(ip6t_ah_init);
136module_exit(cleanup); 136module_exit(ip6t_ah_fini);
diff --git a/net/ipv6/netfilter/ip6t_dst.c b/net/ipv6/netfilter/ip6t_dst.c
index e97a70226987..9422413d0571 100644
--- a/net/ipv6/netfilter/ip6t_dst.c
+++ b/net/ipv6/netfilter/ip6t_dst.c
@@ -206,15 +206,15 @@ static struct ip6t_match opts_match = {
206 .me = THIS_MODULE, 206 .me = THIS_MODULE,
207}; 207};
208 208
209static int __init init(void) 209static int __init ip6t_dst_init(void)
210{ 210{
211 return ip6t_register_match(&opts_match); 211 return ip6t_register_match(&opts_match);
212} 212}
213 213
214static void __exit cleanup(void) 214static void __exit ip6t_dst_fini(void)
215{ 215{
216 ip6t_unregister_match(&opts_match); 216 ip6t_unregister_match(&opts_match);
217} 217}
218 218
219module_init(init); 219module_init(ip6t_dst_init);
220module_exit(cleanup); 220module_exit(ip6t_dst_fini);
diff --git a/net/ipv6/netfilter/ip6t_esp.c b/net/ipv6/netfilter/ip6t_esp.c
index 540b8bfd5055..36bedad2c6f7 100644
--- a/net/ipv6/netfilter/ip6t_esp.c
+++ b/net/ipv6/netfilter/ip6t_esp.c
@@ -101,15 +101,15 @@ static struct ip6t_match esp_match = {
101 .me = THIS_MODULE, 101 .me = THIS_MODULE,
102}; 102};
103 103
104static int __init init(void) 104static int __init ip6t_esp_init(void)
105{ 105{
106 return ip6t_register_match(&esp_match); 106 return ip6t_register_match(&esp_match);
107} 107}
108 108
109static void __exit cleanup(void) 109static void __exit ip6t_esp_fini(void)
110{ 110{
111 ip6t_unregister_match(&esp_match); 111 ip6t_unregister_match(&esp_match);
112} 112}
113 113
114module_init(init); 114module_init(ip6t_esp_init);
115module_exit(cleanup); 115module_exit(ip6t_esp_fini);
diff --git a/net/ipv6/netfilter/ip6t_eui64.c b/net/ipv6/netfilter/ip6t_eui64.c
index d4b0bad52830..94dbdb8b458d 100644
--- a/net/ipv6/netfilter/ip6t_eui64.c
+++ b/net/ipv6/netfilter/ip6t_eui64.c
@@ -70,15 +70,15 @@ static struct ip6t_match eui64_match = {
70 .me = THIS_MODULE, 70 .me = THIS_MODULE,
71}; 71};
72 72
73static int __init init(void) 73static int __init ip6t_eui64_init(void)
74{ 74{
75 return ip6t_register_match(&eui64_match); 75 return ip6t_register_match(&eui64_match);
76} 76}
77 77
78static void __exit fini(void) 78static void __exit ip6t_eui64_fini(void)
79{ 79{
80 ip6t_unregister_match(&eui64_match); 80 ip6t_unregister_match(&eui64_match);
81} 81}
82 82
83module_init(init); 83module_init(ip6t_eui64_init);
84module_exit(fini); 84module_exit(ip6t_eui64_fini);
diff --git a/net/ipv6/netfilter/ip6t_frag.c b/net/ipv6/netfilter/ip6t_frag.c
index 4c41e14823d5..06768c84bd31 100644
--- a/net/ipv6/netfilter/ip6t_frag.c
+++ b/net/ipv6/netfilter/ip6t_frag.c
@@ -139,15 +139,15 @@ static struct ip6t_match frag_match = {
139 .me = THIS_MODULE, 139 .me = THIS_MODULE,
140}; 140};
141 141
142static int __init init(void) 142static int __init ip6t_frag_init(void)
143{ 143{
144 return ip6t_register_match(&frag_match); 144 return ip6t_register_match(&frag_match);
145} 145}
146 146
147static void __exit cleanup(void) 147static void __exit ip6t_frag_fini(void)
148{ 148{
149 ip6t_unregister_match(&frag_match); 149 ip6t_unregister_match(&frag_match);
150} 150}
151 151
152module_init(init); 152module_init(ip6t_frag_init);
153module_exit(cleanup); 153module_exit(ip6t_frag_fini);
diff --git a/net/ipv6/netfilter/ip6t_hbh.c b/net/ipv6/netfilter/ip6t_hbh.c
index b4a1fdfe6abc..374f1be85c0d 100644
--- a/net/ipv6/netfilter/ip6t_hbh.c
+++ b/net/ipv6/netfilter/ip6t_hbh.c
@@ -206,15 +206,15 @@ static struct ip6t_match opts_match = {
206 .me = THIS_MODULE, 206 .me = THIS_MODULE,
207}; 207};
208 208
209static int __init init(void) 209static int __init ip6t_hbh_init(void)
210{ 210{
211 return ip6t_register_match(&opts_match); 211 return ip6t_register_match(&opts_match);
212} 212}
213 213
214static void __exit cleanup(void) 214static void __exit ip6t_hbh_fini(void)
215{ 215{
216 ip6t_unregister_match(&opts_match); 216 ip6t_unregister_match(&opts_match);
217} 217}
218 218
219module_init(init); 219module_init(ip6t_hbh_init);
220module_exit(cleanup); 220module_exit(ip6t_hbh_fini);
diff --git a/net/ipv6/netfilter/ip6t_hl.c b/net/ipv6/netfilter/ip6t_hl.c
index 374055733b26..44a729e17c48 100644
--- a/net/ipv6/netfilter/ip6t_hl.c
+++ b/net/ipv6/netfilter/ip6t_hl.c
@@ -55,16 +55,16 @@ static struct ip6t_match hl_match = {
55 .me = THIS_MODULE, 55 .me = THIS_MODULE,
56}; 56};
57 57
58static int __init init(void) 58static int __init ip6t_hl_init(void)
59{ 59{
60 return ip6t_register_match(&hl_match); 60 return ip6t_register_match(&hl_match);
61} 61}
62 62
63static void __exit fini(void) 63static void __exit ip6t_hl_fini(void)
64{ 64{
65 ip6t_unregister_match(&hl_match); 65 ip6t_unregister_match(&hl_match);
66 66
67} 67}
68 68
69module_init(init); 69module_init(ip6t_hl_init);
70module_exit(fini); 70module_exit(ip6t_hl_fini);
diff --git a/net/ipv6/netfilter/ip6t_multiport.c b/net/ipv6/netfilter/ip6t_multiport.c
index 752b65d21c72..10c48ba596d6 100644
--- a/net/ipv6/netfilter/ip6t_multiport.c
+++ b/net/ipv6/netfilter/ip6t_multiport.c
@@ -111,15 +111,15 @@ static struct ip6t_match multiport_match = {
111 .me = THIS_MODULE, 111 .me = THIS_MODULE,
112}; 112};
113 113
114static int __init init(void) 114static int __init ip6t_multiport_init(void)
115{ 115{
116 return ip6t_register_match(&multiport_match); 116 return ip6t_register_match(&multiport_match);
117} 117}
118 118
119static void __exit fini(void) 119static void __exit ip6t_multiport_fini(void)
120{ 120{
121 ip6t_unregister_match(&multiport_match); 121 ip6t_unregister_match(&multiport_match);
122} 122}
123 123
124module_init(init); 124module_init(ip6t_multiport_init);
125module_exit(fini); 125module_exit(ip6t_multiport_fini);
diff --git a/net/ipv6/netfilter/ip6t_owner.c b/net/ipv6/netfilter/ip6t_owner.c
index e2cee3bcdef9..5d047990cd44 100644
--- a/net/ipv6/netfilter/ip6t_owner.c
+++ b/net/ipv6/netfilter/ip6t_owner.c
@@ -79,15 +79,15 @@ static struct ip6t_match owner_match = {
79 .me = THIS_MODULE, 79 .me = THIS_MODULE,
80}; 80};
81 81
82static int __init init(void) 82static int __init ip6t_owner_init(void)
83{ 83{
84 return ip6t_register_match(&owner_match); 84 return ip6t_register_match(&owner_match);
85} 85}
86 86
87static void __exit fini(void) 87static void __exit ip6t_owner_fini(void)
88{ 88{
89 ip6t_unregister_match(&owner_match); 89 ip6t_unregister_match(&owner_match);
90} 90}
91 91
92module_init(init); 92module_init(ip6t_owner_init);
93module_exit(fini); 93module_exit(ip6t_owner_fini);
diff --git a/net/ipv6/netfilter/ip6t_rt.c b/net/ipv6/netfilter/ip6t_rt.c
index 4c6b55bb225b..fbb0184a41d8 100644
--- a/net/ipv6/netfilter/ip6t_rt.c
+++ b/net/ipv6/netfilter/ip6t_rt.c
@@ -225,15 +225,15 @@ static struct ip6t_match rt_match = {
225 .me = THIS_MODULE, 225 .me = THIS_MODULE,
226}; 226};
227 227
228static int __init init(void) 228static int __init ip6t_rt_init(void)
229{ 229{
230 return ip6t_register_match(&rt_match); 230 return ip6t_register_match(&rt_match);
231} 231}
232 232
233static void __exit cleanup(void) 233static void __exit ip6t_rt_fini(void)
234{ 234{
235 ip6t_unregister_match(&rt_match); 235 ip6t_unregister_match(&rt_match);
236} 236}
237 237
238module_init(init); 238module_init(ip6t_rt_init);
239module_exit(cleanup); 239module_exit(ip6t_rt_fini);
diff --git a/net/ipv6/netfilter/ip6table_filter.c b/net/ipv6/netfilter/ip6table_filter.c
index ce4a968e1f70..e5e724d9ee60 100644
--- a/net/ipv6/netfilter/ip6table_filter.c
+++ b/net/ipv6/netfilter/ip6table_filter.c
@@ -159,7 +159,7 @@ static struct nf_hook_ops ip6t_ops[] = {
159static int forward = NF_ACCEPT; 159static int forward = NF_ACCEPT;
160module_param(forward, bool, 0000); 160module_param(forward, bool, 0000);
161 161
162static int __init init(void) 162static int __init ip6table_filter_init(void)
163{ 163{
164 int ret; 164 int ret;
165 165
@@ -201,7 +201,7 @@ static int __init init(void)
201 return ret; 201 return ret;
202} 202}
203 203
204static void __exit fini(void) 204static void __exit ip6table_filter_fini(void)
205{ 205{
206 unsigned int i; 206 unsigned int i;
207 207
@@ -211,5 +211,5 @@ static void __exit fini(void)
211 ip6t_unregister_table(&packet_filter); 211 ip6t_unregister_table(&packet_filter);
212} 212}
213 213
214module_init(init); 214module_init(ip6table_filter_init);
215module_exit(fini); 215module_exit(ip6table_filter_fini);
diff --git a/net/ipv6/netfilter/ip6table_mangle.c b/net/ipv6/netfilter/ip6table_mangle.c
index 30a4627e000d..e1f0f6ae9841 100644
--- a/net/ipv6/netfilter/ip6table_mangle.c
+++ b/net/ipv6/netfilter/ip6table_mangle.c
@@ -228,7 +228,7 @@ static struct nf_hook_ops ip6t_ops[] = {
228 }, 228 },
229}; 229};
230 230
231static int __init init(void) 231static int __init ip6table_mangle_init(void)
232{ 232{
233 int ret; 233 int ret;
234 234
@@ -274,7 +274,7 @@ static int __init init(void)
274 return ret; 274 return ret;
275} 275}
276 276
277static void __exit fini(void) 277static void __exit ip6table_mangle_fini(void)
278{ 278{
279 unsigned int i; 279 unsigned int i;
280 280
@@ -284,5 +284,5 @@ static void __exit fini(void)
284 ip6t_unregister_table(&packet_mangler); 284 ip6t_unregister_table(&packet_mangler);
285} 285}
286 286
287module_init(init); 287module_init(ip6table_mangle_init);
288module_exit(fini); 288module_exit(ip6table_mangle_fini);
diff --git a/net/ipv6/netfilter/ip6table_raw.c b/net/ipv6/netfilter/ip6table_raw.c
index db28ba3855e2..54d1fffd62ba 100644
--- a/net/ipv6/netfilter/ip6table_raw.c
+++ b/net/ipv6/netfilter/ip6table_raw.c
@@ -142,7 +142,7 @@ static struct nf_hook_ops ip6t_ops[] = {
142 }, 142 },
143}; 143};
144 144
145static int __init init(void) 145static int __init ip6table_raw_init(void)
146{ 146{
147 int ret; 147 int ret;
148 148
@@ -170,7 +170,7 @@ static int __init init(void)
170 return ret; 170 return ret;
171} 171}
172 172
173static void __exit fini(void) 173static void __exit ip6table_raw_fini(void)
174{ 174{
175 unsigned int i; 175 unsigned int i;
176 176
@@ -180,6 +180,6 @@ static void __exit fini(void)
180 ip6t_unregister_table(&packet_raw); 180 ip6t_unregister_table(&packet_raw);
181} 181}
182 182
183module_init(init); 183module_init(ip6table_raw_init);
184module_exit(fini); 184module_exit(ip6table_raw_fini);
185MODULE_LICENSE("GPL"); 185MODULE_LICENSE("GPL");
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index c16f62934bd9..c8b5a96cbb0f 100644
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -588,16 +588,16 @@ MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET6));
588MODULE_LICENSE("GPL"); 588MODULE_LICENSE("GPL");
589MODULE_AUTHOR("Yasuyuki KOZAKAI @USAGI <yasuyuki.kozakai@toshiba.co.jp>"); 589MODULE_AUTHOR("Yasuyuki KOZAKAI @USAGI <yasuyuki.kozakai@toshiba.co.jp>");
590 590
591static int __init init(void) 591static int __init nf_conntrack_l3proto_ipv6_init(void)
592{ 592{
593 need_conntrack(); 593 need_conntrack();
594 return init_or_cleanup(1); 594 return init_or_cleanup(1);
595} 595}
596 596
597static void __exit fini(void) 597static void __exit nf_conntrack_l3proto_ipv6_fini(void)
598{ 598{
599 init_or_cleanup(0); 599 init_or_cleanup(0);
600} 600}
601 601
602module_init(init); 602module_init(nf_conntrack_l3proto_ipv6_init);
603module_exit(fini); 603module_exit(nf_conntrack_l3proto_ipv6_fini);
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index cd191b0d4ac7..e38a4b5a3089 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -624,7 +624,7 @@ static struct nf_conntrack_helper ftp[MAX_PORTS][2];
624static char ftp_names[MAX_PORTS][2][sizeof("ftp-65535")]; 624static char ftp_names[MAX_PORTS][2][sizeof("ftp-65535")];
625 625
626/* don't make this __exit, since it's called from __init ! */ 626/* don't make this __exit, since it's called from __init ! */
627static void fini(void) 627static void nf_conntrack_ftp_fini(void)
628{ 628{
629 int i, j; 629 int i, j;
630 for (i = 0; i < ports_c; i++) { 630 for (i = 0; i < ports_c; i++) {
@@ -642,7 +642,7 @@ static void fini(void)
642 kfree(ftp_buffer); 642 kfree(ftp_buffer);
643} 643}
644 644
645static int __init init(void) 645static int __init nf_conntrack_ftp_init(void)
646{ 646{
647 int i, j = -1, ret = 0; 647 int i, j = -1, ret = 0;
648 char *tmpname; 648 char *tmpname;
@@ -683,7 +683,7 @@ static int __init init(void)
683 printk("nf_ct_ftp: failed to register helper " 683 printk("nf_ct_ftp: failed to register helper "
684 " for pf: %d port: %d\n", 684 " for pf: %d port: %d\n",
685 ftp[i][j].tuple.src.l3num, ports[i]); 685 ftp[i][j].tuple.src.l3num, ports[i]);
686 fini(); 686 nf_conntrack_ftp_fini();
687 return ret; 687 return ret;
688 } 688 }
689 } 689 }
@@ -692,5 +692,5 @@ static int __init init(void)
692 return 0; 692 return 0;
693} 693}
694 694
695module_init(init); 695module_init(nf_conntrack_ftp_init);
696module_exit(fini); 696module_exit(nf_conntrack_ftp_fini);
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
index cf798e61e379..9cccc325b687 100644
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -615,7 +615,7 @@ static ctl_table nf_ct_net_table[] = {
615static struct ctl_table_header *nf_ct_sysctl_header; 615static struct ctl_table_header *nf_ct_sysctl_header;
616#endif 616#endif
617 617
618int __init init(void) 618int __init nf_conntrack_proto_sctp_init(void)
619{ 619{
620 int ret; 620 int ret;
621 621
@@ -652,7 +652,7 @@ int __init init(void)
652 return ret; 652 return ret;
653} 653}
654 654
655void __exit fini(void) 655void __exit nf_conntrack_proto_sctp_fini(void)
656{ 656{
657 nf_conntrack_protocol_unregister(&nf_conntrack_protocol_sctp6); 657 nf_conntrack_protocol_unregister(&nf_conntrack_protocol_sctp6);
658 nf_conntrack_protocol_unregister(&nf_conntrack_protocol_sctp4); 658 nf_conntrack_protocol_unregister(&nf_conntrack_protocol_sctp4);
@@ -662,8 +662,8 @@ void __exit fini(void)
662 DEBUGP("SCTP conntrack module unloaded\n"); 662 DEBUGP("SCTP conntrack module unloaded\n");
663} 663}
664 664
665module_init(init); 665module_init(nf_conntrack_proto_sctp_init);
666module_exit(fini); 666module_exit(nf_conntrack_proto_sctp_fini);
667 667
668MODULE_LICENSE("GPL"); 668MODULE_LICENSE("GPL");
669MODULE_AUTHOR("Kiran Kumar Immidi"); 669MODULE_AUTHOR("Kiran Kumar Immidi");
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 75577e175b35..c72aa3cd22e4 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -806,18 +806,18 @@ void nf_conntrack_protocol_unregister(struct nf_conntrack_protocol *proto)
806 nf_ct_iterate_cleanup(kill_proto, proto); 806 nf_ct_iterate_cleanup(kill_proto, proto);
807} 807}
808 808
809static int __init init(void) 809static int __init nf_conntrack_standalone_init(void)
810{ 810{
811 return init_or_cleanup(1); 811 return init_or_cleanup(1);
812} 812}
813 813
814static void __exit fini(void) 814static void __exit nf_conntrack_standalone_fini(void)
815{ 815{
816 init_or_cleanup(0); 816 init_or_cleanup(0);
817} 817}
818 818
819module_init(init); 819module_init(nf_conntrack_standalone_init);
820module_exit(fini); 820module_exit(nf_conntrack_standalone_fini);
821 821
822/* Some modules need us, but don't depend directly on any symbol. 822/* Some modules need us, but don't depend directly on any symbol.
823 They should call this. */ 823 They should call this. */
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 54cbbaa712dc..3e3f5448bacb 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -1081,13 +1081,13 @@ cleanup_netlink_notifier:
1081 return status; 1081 return status;
1082} 1082}
1083 1083
1084static int __init init(void) 1084static int __init nfnetlink_log_init(void)
1085{ 1085{
1086 1086
1087 return init_or_cleanup(1); 1087 return init_or_cleanup(1);
1088} 1088}
1089 1089
1090static void __exit fini(void) 1090static void __exit nfnetlink_log_fini(void)
1091{ 1091{
1092 init_or_cleanup(0); 1092 init_or_cleanup(0);
1093} 1093}
@@ -1097,5 +1097,5 @@ MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
1097MODULE_LICENSE("GPL"); 1097MODULE_LICENSE("GPL");
1098MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_ULOG); 1098MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_ULOG);
1099 1099
1100module_init(init); 1100module_init(nfnetlink_log_init);
1101module_exit(fini); 1101module_exit(nfnetlink_log_fini);
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index b5701662182e..d0e62f68139f 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -1117,13 +1117,13 @@ cleanup_netlink_notifier:
1117 return status; 1117 return status;
1118} 1118}
1119 1119
1120static int __init init(void) 1120static int __init nfnetlink_queue_init(void)
1121{ 1121{
1122 1122
1123 return init_or_cleanup(1); 1123 return init_or_cleanup(1);
1124} 1124}
1125 1125
1126static void __exit fini(void) 1126static void __exit nfnetlink_queue_fini(void)
1127{ 1127{
1128 init_or_cleanup(0); 1128 init_or_cleanup(0);
1129} 1129}
@@ -1133,5 +1133,5 @@ MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
1133MODULE_LICENSE("GPL"); 1133MODULE_LICENSE("GPL");
1134MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_QUEUE); 1134MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_QUEUE);
1135 1135
1136module_init(init); 1136module_init(nfnetlink_queue_init);
1137module_exit(fini); 1137module_exit(nfnetlink_queue_fini);
diff --git a/net/netfilter/xt_CLASSIFY.c b/net/netfilter/xt_CLASSIFY.c
index 3cd2ac90a25b..e54e57730012 100644
--- a/net/netfilter/xt_CLASSIFY.c
+++ b/net/netfilter/xt_CLASSIFY.c
@@ -62,7 +62,7 @@ static struct xt_target classify6_reg = {
62}; 62};
63 63
64 64
65static int __init init(void) 65static int __init xt_classify_init(void)
66{ 66{
67 int ret; 67 int ret;
68 68
@@ -77,11 +77,11 @@ static int __init init(void)
77 return ret; 77 return ret;
78} 78}
79 79
80static void __exit fini(void) 80static void __exit xt_classify_fini(void)
81{ 81{
82 xt_unregister_target(&classify_reg); 82 xt_unregister_target(&classify_reg);
83 xt_unregister_target(&classify6_reg); 83 xt_unregister_target(&classify6_reg);
84} 84}
85 85
86module_init(init); 86module_init(xt_classify_init);
87module_exit(fini); 87module_exit(xt_classify_fini);
diff --git a/net/netfilter/xt_CONNMARK.c b/net/netfilter/xt_CONNMARK.c
index 35448b8e6883..60c375d36f01 100644
--- a/net/netfilter/xt_CONNMARK.c
+++ b/net/netfilter/xt_CONNMARK.c
@@ -115,7 +115,7 @@ static struct xt_target connmark6_reg = {
115 .me = THIS_MODULE 115 .me = THIS_MODULE
116}; 116};
117 117
118static int __init init(void) 118static int __init xt_connmark_init(void)
119{ 119{
120 int ret; 120 int ret;
121 121
@@ -132,11 +132,11 @@ static int __init init(void)
132 return ret; 132 return ret;
133} 133}
134 134
135static void __exit fini(void) 135static void __exit xt_connmark_fini(void)
136{ 136{
137 xt_unregister_target(&connmark_reg); 137 xt_unregister_target(&connmark_reg);
138 xt_unregister_target(&connmark6_reg); 138 xt_unregister_target(&connmark6_reg);
139} 139}
140 140
141module_init(init); 141module_init(xt_connmark_init);
142module_exit(fini); 142module_exit(xt_connmark_fini);
diff --git a/net/netfilter/xt_MARK.c b/net/netfilter/xt_MARK.c
index 73bdd5c80e17..ee9c34edc76c 100644
--- a/net/netfilter/xt_MARK.c
+++ b/net/netfilter/xt_MARK.c
@@ -145,7 +145,7 @@ static struct xt_target ip6t_mark_reg_v0 = {
145 .revision = 0, 145 .revision = 0,
146}; 146};
147 147
148static int __init init(void) 148static int __init xt_mark_init(void)
149{ 149{
150 int err; 150 int err;
151 151
@@ -166,12 +166,12 @@ static int __init init(void)
166 return err; 166 return err;
167} 167}
168 168
169static void __exit fini(void) 169static void __exit xt_mark_fini(void)
170{ 170{
171 xt_unregister_target(&ipt_mark_reg_v0); 171 xt_unregister_target(&ipt_mark_reg_v0);
172 xt_unregister_target(&ipt_mark_reg_v1); 172 xt_unregister_target(&ipt_mark_reg_v1);
173 xt_unregister_target(&ip6t_mark_reg_v0); 173 xt_unregister_target(&ip6t_mark_reg_v0);
174} 174}
175 175
176module_init(init); 176module_init(xt_mark_init);
177module_exit(fini); 177module_exit(xt_mark_fini);
diff --git a/net/netfilter/xt_NFQUEUE.c b/net/netfilter/xt_NFQUEUE.c
index 2873e1c60f68..86ccceb61fdd 100644
--- a/net/netfilter/xt_NFQUEUE.c
+++ b/net/netfilter/xt_NFQUEUE.c
@@ -61,7 +61,7 @@ static struct xt_target arpt_NFQ_reg = {
61 .me = THIS_MODULE, 61 .me = THIS_MODULE,
62}; 62};
63 63
64static int __init init(void) 64static int __init xt_nfqueue_init(void)
65{ 65{
66 int ret; 66 int ret;
67 ret = xt_register_target(&ipt_NFQ_reg); 67 ret = xt_register_target(&ipt_NFQ_reg);
@@ -83,12 +83,12 @@ out_ip:
83 return ret; 83 return ret;
84} 84}
85 85
86static void __exit fini(void) 86static void __exit xt_nfqueue_fini(void)
87{ 87{
88 xt_unregister_target(&arpt_NFQ_reg); 88 xt_unregister_target(&arpt_NFQ_reg);
89 xt_unregister_target(&ip6t_NFQ_reg); 89 xt_unregister_target(&ip6t_NFQ_reg);
90 xt_unregister_target(&ipt_NFQ_reg); 90 xt_unregister_target(&ipt_NFQ_reg);
91} 91}
92 92
93module_init(init); 93module_init(xt_nfqueue_init);
94module_exit(fini); 94module_exit(xt_nfqueue_fini);
diff --git a/net/netfilter/xt_NOTRACK.c b/net/netfilter/xt_NOTRACK.c
index cf2ebd76fd6f..98f4b5363ce8 100644
--- a/net/netfilter/xt_NOTRACK.c
+++ b/net/netfilter/xt_NOTRACK.c
@@ -52,7 +52,7 @@ static struct xt_target notrack6_reg = {
52 .me = THIS_MODULE, 52 .me = THIS_MODULE,
53}; 53};
54 54
55static int __init init(void) 55static int __init xt_notrack_init(void)
56{ 56{
57 int ret; 57 int ret;
58 58
@@ -67,11 +67,11 @@ static int __init init(void)
67 return ret; 67 return ret;
68} 68}
69 69
70static void __exit fini(void) 70static void __exit xt_notrack_fini(void)
71{ 71{
72 xt_unregister_target(&notrack6_reg); 72 xt_unregister_target(&notrack6_reg);
73 xt_unregister_target(&notrack_reg); 73 xt_unregister_target(&notrack_reg);
74} 74}
75 75
76module_init(init); 76module_init(xt_notrack_init);
77module_exit(fini); 77module_exit(xt_notrack_fini);
diff --git a/net/netfilter/xt_comment.c b/net/netfilter/xt_comment.c
index 2637724b498d..197609cb06d7 100644
--- a/net/netfilter/xt_comment.c
+++ b/net/netfilter/xt_comment.c
@@ -45,7 +45,7 @@ static struct xt_match comment6_match = {
45 .me = THIS_MODULE 45 .me = THIS_MODULE
46}; 46};
47 47
48static int __init init(void) 48static int __init xt_comment_init(void)
49{ 49{
50 int ret; 50 int ret;
51 51
@@ -60,11 +60,11 @@ static int __init init(void)
60 return ret; 60 return ret;
61} 61}
62 62
63static void __exit fini(void) 63static void __exit xt_comment_fini(void)
64{ 64{
65 xt_unregister_match(&comment_match); 65 xt_unregister_match(&comment_match);
66 xt_unregister_match(&comment6_match); 66 xt_unregister_match(&comment6_match);
67} 67}
68 68
69module_init(init); 69module_init(xt_comment_init);
70module_exit(fini); 70module_exit(xt_comment_fini);
diff --git a/net/netfilter/xt_connbytes.c b/net/netfilter/xt_connbytes.c
index 4985f5ec58ca..1396fe2d07c1 100644
--- a/net/netfilter/xt_connbytes.c
+++ b/net/netfilter/xt_connbytes.c
@@ -160,7 +160,7 @@ static struct xt_match connbytes6_match = {
160 .me = THIS_MODULE 160 .me = THIS_MODULE
161}; 161};
162 162
163static int __init init(void) 163static int __init xt_connbytes_init(void)
164{ 164{
165 int ret; 165 int ret;
166 ret = xt_register_match(&connbytes_match); 166 ret = xt_register_match(&connbytes_match);
@@ -173,11 +173,11 @@ static int __init init(void)
173 return ret; 173 return ret;
174} 174}
175 175
176static void __exit fini(void) 176static void __exit xt_connbytes_fini(void)
177{ 177{
178 xt_unregister_match(&connbytes_match); 178 xt_unregister_match(&connbytes_match);
179 xt_unregister_match(&connbytes6_match); 179 xt_unregister_match(&connbytes6_match);
180} 180}
181 181
182module_init(init); 182module_init(xt_connbytes_init);
183module_exit(fini); 183module_exit(xt_connbytes_fini);
diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
index 7b16f1ee16b4..dc26a27cbcaf 100644
--- a/net/netfilter/xt_connmark.c
+++ b/net/netfilter/xt_connmark.c
@@ -102,7 +102,7 @@ static struct xt_match connmark6_match = {
102 .me = THIS_MODULE 102 .me = THIS_MODULE
103}; 103};
104 104
105static int __init init(void) 105static int __init xt_connmark_init(void)
106{ 106{
107 int ret; 107 int ret;
108 108
@@ -118,11 +118,11 @@ static int __init init(void)
118 return ret; 118 return ret;
119} 119}
120 120
121static void __exit fini(void) 121static void __exit xt_connmark_fini(void)
122{ 122{
123 xt_unregister_match(&connmark6_match); 123 xt_unregister_match(&connmark6_match);
124 xt_unregister_match(&connmark_match); 124 xt_unregister_match(&connmark_match);
125} 125}
126 126
127module_init(init); 127module_init(xt_connmark_init);
128module_exit(fini); 128module_exit(xt_connmark_fini);
diff --git a/net/netfilter/xt_conntrack.c b/net/netfilter/xt_conntrack.c
index 65a84809fd30..145489a4c3f2 100644
--- a/net/netfilter/xt_conntrack.c
+++ b/net/netfilter/xt_conntrack.c
@@ -239,7 +239,7 @@ static struct xt_match conntrack_match = {
239 .me = THIS_MODULE, 239 .me = THIS_MODULE,
240}; 240};
241 241
242static int __init init(void) 242static int __init xt_conntrack_init(void)
243{ 243{
244 int ret; 244 int ret;
245 need_conntrack(); 245 need_conntrack();
@@ -248,10 +248,10 @@ static int __init init(void)
248 return ret; 248 return ret;
249} 249}
250 250
251static void __exit fini(void) 251static void __exit xt_conntrack_fini(void)
252{ 252{
253 xt_unregister_match(&conntrack_match); 253 xt_unregister_match(&conntrack_match);
254} 254}
255 255
256module_init(init); 256module_init(xt_conntrack_init);
257module_exit(fini); 257module_exit(xt_conntrack_fini);
diff --git a/net/netfilter/xt_dccp.c b/net/netfilter/xt_dccp.c
index 2f331decd151..dfb10b648e57 100644
--- a/net/netfilter/xt_dccp.c
+++ b/net/netfilter/xt_dccp.c
@@ -164,7 +164,7 @@ static struct xt_match dccp6_match =
164}; 164};
165 165
166 166
167static int __init init(void) 167static int __init xt_dccp_init(void)
168{ 168{
169 int ret; 169 int ret;
170 170
@@ -191,12 +191,12 @@ out_kfree:
191 return ret; 191 return ret;
192} 192}
193 193
194static void __exit fini(void) 194static void __exit xt_dccp_fini(void)
195{ 195{
196 xt_unregister_match(&dccp6_match); 196 xt_unregister_match(&dccp6_match);
197 xt_unregister_match(&dccp_match); 197 xt_unregister_match(&dccp_match);
198 kfree(dccp_optbuf); 198 kfree(dccp_optbuf);
199} 199}
200 200
201module_init(init); 201module_init(xt_dccp_init);
202module_exit(fini); 202module_exit(xt_dccp_fini);
diff --git a/net/netfilter/xt_helper.c b/net/netfilter/xt_helper.c
index 101f0005e987..799c2a43e3b9 100644
--- a/net/netfilter/xt_helper.c
+++ b/net/netfilter/xt_helper.c
@@ -182,7 +182,7 @@ static struct xt_match helper6_match = {
182 .me = THIS_MODULE, 182 .me = THIS_MODULE,
183}; 183};
184 184
185static int __init init(void) 185static int __init xt_helper_init(void)
186{ 186{
187 int ret; 187 int ret;
188 need_conntrack(); 188 need_conntrack();
@@ -198,12 +198,12 @@ static int __init init(void)
198 return ret; 198 return ret;
199} 199}
200 200
201static void __exit fini(void) 201static void __exit xt_helper_fini(void)
202{ 202{
203 xt_unregister_match(&helper_match); 203 xt_unregister_match(&helper_match);
204 xt_unregister_match(&helper6_match); 204 xt_unregister_match(&helper6_match);
205} 205}
206 206
207module_init(init); 207module_init(xt_helper_init);
208module_exit(fini); 208module_exit(xt_helper_fini);
209 209
diff --git a/net/netfilter/xt_length.c b/net/netfilter/xt_length.c
index 38560caef757..109132c9a146 100644
--- a/net/netfilter/xt_length.c
+++ b/net/netfilter/xt_length.c
@@ -68,7 +68,7 @@ static struct xt_match length6_match = {
68 .me = THIS_MODULE, 68 .me = THIS_MODULE,
69}; 69};
70 70
71static int __init init(void) 71static int __init xt_length_init(void)
72{ 72{
73 int ret; 73 int ret;
74 ret = xt_register_match(&length_match); 74 ret = xt_register_match(&length_match);
@@ -81,11 +81,11 @@ static int __init init(void)
81 return ret; 81 return ret;
82} 82}
83 83
84static void __exit fini(void) 84static void __exit xt_length_fini(void)
85{ 85{
86 xt_unregister_match(&length_match); 86 xt_unregister_match(&length_match);
87 xt_unregister_match(&length6_match); 87 xt_unregister_match(&length6_match);
88} 88}
89 89
90module_init(init); 90module_init(xt_length_init);
91module_exit(fini); 91module_exit(xt_length_fini);
diff --git a/net/netfilter/xt_limit.c b/net/netfilter/xt_limit.c
index e91c1a444e77..ce7fdb7e4e07 100644
--- a/net/netfilter/xt_limit.c
+++ b/net/netfilter/xt_limit.c
@@ -153,7 +153,7 @@ static struct xt_match limit6_reg = {
153 .me = THIS_MODULE, 153 .me = THIS_MODULE,
154}; 154};
155 155
156static int __init init(void) 156static int __init xt_limit_init(void)
157{ 157{
158 int ret; 158 int ret;
159 159
@@ -168,11 +168,11 @@ static int __init init(void)
168 return ret; 168 return ret;
169} 169}
170 170
171static void __exit fini(void) 171static void __exit xt_limit_fini(void)
172{ 172{
173 xt_unregister_match(&ipt_limit_reg); 173 xt_unregister_match(&ipt_limit_reg);
174 xt_unregister_match(&limit6_reg); 174 xt_unregister_match(&limit6_reg);
175} 175}
176 176
177module_init(init); 177module_init(xt_limit_init);
178module_exit(fini); 178module_exit(xt_limit_fini);
diff --git a/net/netfilter/xt_mac.c b/net/netfilter/xt_mac.c
index f4defa28a6ec..356290ffe386 100644
--- a/net/netfilter/xt_mac.c
+++ b/net/netfilter/xt_mac.c
@@ -62,7 +62,7 @@ static struct xt_match mac6_match = {
62 .me = THIS_MODULE, 62 .me = THIS_MODULE,
63}; 63};
64 64
65static int __init init(void) 65static int __init xt_mac_init(void)
66{ 66{
67 int ret; 67 int ret;
68 ret = xt_register_match(&mac_match); 68 ret = xt_register_match(&mac_match);
@@ -76,11 +76,11 @@ static int __init init(void)
76 return ret; 76 return ret;
77} 77}
78 78
79static void __exit fini(void) 79static void __exit xt_mac_fini(void)
80{ 80{
81 xt_unregister_match(&mac_match); 81 xt_unregister_match(&mac_match);
82 xt_unregister_match(&mac6_match); 82 xt_unregister_match(&mac6_match);
83} 83}
84 84
85module_init(init); 85module_init(xt_mac_init);
86module_exit(fini); 86module_exit(xt_mac_fini);
diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
index ce0badfeef9a..8b385a34886d 100644
--- a/net/netfilter/xt_mark.c
+++ b/net/netfilter/xt_mark.c
@@ -69,7 +69,7 @@ static struct xt_match mark6_match = {
69 .me = THIS_MODULE, 69 .me = THIS_MODULE,
70}; 70};
71 71
72static int __init init(void) 72static int __init xt_mark_init(void)
73{ 73{
74 int ret; 74 int ret;
75 ret = xt_register_match(&mark_match); 75 ret = xt_register_match(&mark_match);
@@ -83,11 +83,11 @@ static int __init init(void)
83 return ret; 83 return ret;
84} 84}
85 85
86static void __exit fini(void) 86static void __exit xt_mark_fini(void)
87{ 87{
88 xt_unregister_match(&mark_match); 88 xt_unregister_match(&mark_match);
89 xt_unregister_match(&mark6_match); 89 xt_unregister_match(&mark6_match);
90} 90}
91 91
92module_init(init); 92module_init(xt_mark_init);
93module_exit(fini); 93module_exit(xt_mark_fini);
diff --git a/net/netfilter/xt_physdev.c b/net/netfilter/xt_physdev.c
index 089f4f7e8636..5fe4c9df17f5 100644
--- a/net/netfilter/xt_physdev.c
+++ b/net/netfilter/xt_physdev.c
@@ -134,7 +134,7 @@ static struct xt_match physdev6_match = {
134 .me = THIS_MODULE, 134 .me = THIS_MODULE,
135}; 135};
136 136
137static int __init init(void) 137static int __init xt_physdev_init(void)
138{ 138{
139 int ret; 139 int ret;
140 140
@@ -149,11 +149,11 @@ static int __init init(void)
149 return ret; 149 return ret;
150} 150}
151 151
152static void __exit fini(void) 152static void __exit xt_physdev_fini(void)
153{ 153{
154 xt_unregister_match(&physdev_match); 154 xt_unregister_match(&physdev_match);
155 xt_unregister_match(&physdev6_match); 155 xt_unregister_match(&physdev6_match);
156} 156}
157 157
158module_init(init); 158module_init(xt_physdev_init);
159module_exit(fini); 159module_exit(xt_physdev_fini);
diff --git a/net/netfilter/xt_pkttype.c b/net/netfilter/xt_pkttype.c
index 8b8bca988ac6..3ac703b5cb8f 100644
--- a/net/netfilter/xt_pkttype.c
+++ b/net/netfilter/xt_pkttype.c
@@ -49,7 +49,7 @@ static struct xt_match pkttype6_match = {
49 .me = THIS_MODULE, 49 .me = THIS_MODULE,
50}; 50};
51 51
52static int __init init(void) 52static int __init xt_pkttype_init(void)
53{ 53{
54 int ret; 54 int ret;
55 ret = xt_register_match(&pkttype_match); 55 ret = xt_register_match(&pkttype_match);
@@ -63,11 +63,11 @@ static int __init init(void)
63 return ret; 63 return ret;
64} 64}
65 65
66static void __exit fini(void) 66static void __exit xt_pkttype_fini(void)
67{ 67{
68 xt_unregister_match(&pkttype_match); 68 xt_unregister_match(&pkttype_match);
69 xt_unregister_match(&pkttype6_match); 69 xt_unregister_match(&pkttype6_match);
70} 70}
71 71
72module_init(init); 72module_init(xt_pkttype_init);
73module_exit(fini); 73module_exit(xt_pkttype_fini);
diff --git a/net/netfilter/xt_realm.c b/net/netfilter/xt_realm.c
index 5e31a4a835bf..a80b7d132b65 100644
--- a/net/netfilter/xt_realm.c
+++ b/net/netfilter/xt_realm.c
@@ -49,15 +49,15 @@ static struct xt_match realm_match = {
49 .me = THIS_MODULE 49 .me = THIS_MODULE
50}; 50};
51 51
52static int __init init(void) 52static int __init xt_realm_init(void)
53{ 53{
54 return xt_register_match(&realm_match); 54 return xt_register_match(&realm_match);
55} 55}
56 56
57static void __exit fini(void) 57static void __exit xt_realm_fini(void)
58{ 58{
59 xt_unregister_match(&realm_match); 59 xt_unregister_match(&realm_match);
60} 60}
61 61
62module_init(init); 62module_init(xt_realm_init);
63module_exit(fini); 63module_exit(xt_realm_fini);
diff --git a/net/netfilter/xt_sctp.c b/net/netfilter/xt_sctp.c
index c6eb24a2fe13..34bd87259a09 100644
--- a/net/netfilter/xt_sctp.c
+++ b/net/netfilter/xt_sctp.c
@@ -200,7 +200,7 @@ static struct xt_match sctp6_match = {
200 .me = THIS_MODULE 200 .me = THIS_MODULE
201}; 201};
202 202
203static int __init init(void) 203static int __init xt_sctp_init(void)
204{ 204{
205 int ret; 205 int ret;
206 ret = xt_register_match(&sctp_match); 206 ret = xt_register_match(&sctp_match);
@@ -214,11 +214,11 @@ static int __init init(void)
214 return ret; 214 return ret;
215} 215}
216 216
217static void __exit fini(void) 217static void __exit xt_sctp_fini(void)
218{ 218{
219 xt_unregister_match(&sctp6_match); 219 xt_unregister_match(&sctp6_match);
220 xt_unregister_match(&sctp_match); 220 xt_unregister_match(&sctp_match);
221} 221}
222 222
223module_init(init); 223module_init(xt_sctp_init);
224module_exit(fini); 224module_exit(xt_sctp_fini);
diff --git a/net/netfilter/xt_state.c b/net/netfilter/xt_state.c
index e6c0be9d94d2..f9e304dc4504 100644
--- a/net/netfilter/xt_state.c
+++ b/net/netfilter/xt_state.c
@@ -89,7 +89,7 @@ static struct xt_match state6_match = {
89 .me = THIS_MODULE, 89 .me = THIS_MODULE,
90}; 90};
91 91
92static int __init init(void) 92static int __init xt_state_init(void)
93{ 93{
94 int ret; 94 int ret;
95 95
@@ -106,11 +106,11 @@ static int __init init(void)
106 return ret; 106 return ret;
107} 107}
108 108
109static void __exit fini(void) 109static void __exit xt_state_fini(void)
110{ 110{
111 xt_unregister_match(&state_match); 111 xt_unregister_match(&state_match);
112 xt_unregister_match(&state6_match); 112 xt_unregister_match(&state6_match);
113} 113}
114 114
115module_init(init); 115module_init(xt_state_init);
116module_exit(fini); 116module_exit(xt_state_fini);
diff --git a/net/netfilter/xt_string.c b/net/netfilter/xt_string.c
index 703d80fccacf..79d9ea6964ba 100644
--- a/net/netfilter/xt_string.c
+++ b/net/netfilter/xt_string.c
@@ -91,7 +91,7 @@ static struct xt_match string6_match = {
91 .me = THIS_MODULE 91 .me = THIS_MODULE
92}; 92};
93 93
94static int __init init(void) 94static int __init xt_string_init(void)
95{ 95{
96 int ret; 96 int ret;
97 97
@@ -105,11 +105,11 @@ static int __init init(void)
105 return ret; 105 return ret;
106} 106}
107 107
108static void __exit fini(void) 108static void __exit xt_string_fini(void)
109{ 109{
110 xt_unregister_match(&string_match); 110 xt_unregister_match(&string_match);
111 xt_unregister_match(&string6_match); 111 xt_unregister_match(&string6_match);
112} 112}
113 113
114module_init(init); 114module_init(xt_string_init);
115module_exit(fini); 115module_exit(xt_string_fini);
diff --git a/net/netfilter/xt_tcpmss.c b/net/netfilter/xt_tcpmss.c
index 70a8858ae3f1..cf7d335cadcd 100644
--- a/net/netfilter/xt_tcpmss.c
+++ b/net/netfilter/xt_tcpmss.c
@@ -112,7 +112,7 @@ static struct xt_match tcpmss6_match = {
112}; 112};
113 113
114 114
115static int __init init(void) 115static int __init xt_tcpmss_init(void)
116{ 116{
117 int ret; 117 int ret;
118 ret = xt_register_match(&tcpmss_match); 118 ret = xt_register_match(&tcpmss_match);
@@ -126,11 +126,11 @@ static int __init init(void)
126 return ret; 126 return ret;
127} 127}
128 128
129static void __exit fini(void) 129static void __exit xt_tcpmss_fini(void)
130{ 130{
131 xt_unregister_match(&tcpmss6_match); 131 xt_unregister_match(&tcpmss6_match);
132 xt_unregister_match(&tcpmss_match); 132 xt_unregister_match(&tcpmss_match);
133} 133}
134 134
135module_init(init); 135module_init(xt_tcpmss_init);
136module_exit(fini); 136module_exit(xt_tcpmss_fini);
diff --git a/net/netfilter/xt_tcpudp.c b/net/netfilter/xt_tcpudp.c
index 14a990eb666a..1b61dac9c873 100644
--- a/net/netfilter/xt_tcpudp.c
+++ b/net/netfilter/xt_tcpudp.c
@@ -238,7 +238,7 @@ static struct xt_match udp6_matchstruct = {
238 .me = THIS_MODULE, 238 .me = THIS_MODULE,
239}; 239};
240 240
241static int __init init(void) 241static int __init xt_tcpudp_init(void)
242{ 242{
243 int ret; 243 int ret;
244 ret = xt_register_match(&tcp_matchstruct); 244 ret = xt_register_match(&tcp_matchstruct);
@@ -268,7 +268,7 @@ out_unreg_tcp:
268 return ret; 268 return ret;
269} 269}
270 270
271static void __exit fini(void) 271static void __exit xt_tcpudp_fini(void)
272{ 272{
273 xt_unregister_match(&udp6_matchstruct); 273 xt_unregister_match(&udp6_matchstruct);
274 xt_unregister_match(&udp_matchstruct); 274 xt_unregister_match(&udp_matchstruct);
@@ -276,5 +276,5 @@ static void __exit fini(void)
276 xt_unregister_match(&tcp_matchstruct); 276 xt_unregister_match(&tcp_matchstruct);
277} 277}
278 278
279module_init(init); 279module_init(xt_tcpudp_init);
280module_exit(fini); 280module_exit(xt_tcpudp_fini);