aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>2007-07-08 01:23:42 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-11 01:17:18 -0400
commitceceae1b1555a9afcb8dacf90df5fa1f20fd5466 (patch)
tree008841923a297be92566c8da42f516ffe6c2cdc1 /net/ipv4
parentecfab2c9fe5597221c2b30dec48634a2361a0d08 (diff)
[NETFILTER]: nf_conntrack: use extension infrastructure for helper
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/netfilter/nf_nat_standalone.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/net/ipv4/netfilter/nf_nat_standalone.c b/net/ipv4/netfilter/nf_nat_standalone.c
index 55dac36dbc85..0b2f0c33f7cd 100644
--- a/net/ipv4/netfilter/nf_nat_standalone.c
+++ b/net/ipv4/netfilter/nf_nat_standalone.c
@@ -338,14 +338,6 @@ static int __init nf_nat_standalone_init(void)
338 return ret; 338 return ret;
339 } 339 }
340 340
341 size = ALIGN(size, __alignof__(struct nf_conn_help)) +
342 sizeof(struct nf_conn_help);
343 ret = nf_conntrack_register_cache(NF_CT_F_NAT|NF_CT_F_HELP,
344 "nf_nat:help", size);
345 if (ret < 0) {
346 printk(KERN_ERR "nf_nat_init: Unable to create slab cache\n");
347 goto cleanup_register_cache;
348 }
349#ifdef CONFIG_XFRM 341#ifdef CONFIG_XFRM
350 BUG_ON(ip_nat_decode_session != NULL); 342 BUG_ON(ip_nat_decode_session != NULL);
351 ip_nat_decode_session = nat_decode_session; 343 ip_nat_decode_session = nat_decode_session;
@@ -370,8 +362,6 @@ static int __init nf_nat_standalone_init(void)
370 ip_nat_decode_session = NULL; 362 ip_nat_decode_session = NULL;
371 synchronize_net(); 363 synchronize_net();
372#endif 364#endif
373 nf_conntrack_unregister_cache(NF_CT_F_NAT|NF_CT_F_HELP);
374 cleanup_register_cache:
375 nf_conntrack_unregister_cache(NF_CT_F_NAT); 365 nf_conntrack_unregister_cache(NF_CT_F_NAT);
376 return ret; 366 return ret;
377} 367}