diff options
| author | Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2006-02-15 15:22:21 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-02-15 15:22:21 -0800 |
| commit | 7d3cdc6b554137a7a0534ce38b155a63a3117f27 (patch) | |
| tree | af96ac02ab7884384e2a4e5ac62f8343ee0b463d /net/ipv4 | |
| parent | deac0ccdb4da16b68539d75edecf26162de05150 (diff) | |
| download | op-kernel-dev-7d3cdc6b554137a7a0534ce38b155a63a3117f27.zip op-kernel-dev-7d3cdc6b554137a7a0534ce38b155a63a3117f27.tar.gz | |
[NETFILTER]: nf_conntrack: move registration of __nf_ct_attach
Move registration of __nf_ct_attach to nf_conntrack_core to make it usable
for IPv6 connection tracking as well.
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_conntrack_l3proto_ipv4.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c index 167619f..6c8624a 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c @@ -529,15 +529,10 @@ static int init_or_cleanup(int init) goto cleanup_localinops; } #endif - - /* For use by REJECT target */ - ip_ct_attach = __nf_conntrack_attach; - return ret; cleanup: synchronize_net(); - ip_ct_attach = NULL; #ifdef CONFIG_SYSCTL unregister_sysctl_table(nf_ct_ipv4_sysctl_header); cleanup_localinops: |
