Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d3cdc6b authored by Yasuyuki Kozakai's avatar Yasuyuki Kozakai Committed by David S. Miller
Browse files

[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: default avatarYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent deac0ccd

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+0 −5
Original line number Diff line number Diff line
@@ -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:

net/netfilter/nf_conntrack_core.c

+5 −0
Original line number Diff line number Diff line
@@ -1556,6 +1556,8 @@ void nf_conntrack_cleanup(void) 
{

	int i;



	ip_ct_attach = NULL;



	/* This makes sure all current packets have passed through

	   netfilter framework.  Roll on, two-stage module

	   delete... */
@@ -1715,6 +1717,9 @@ int __init nf_conntrack_init(void) 
		nf_ct_l3protos[i] = &nf_conntrack_generic_l3proto;

        write_unlock_bh(&nf_conntrack_lock);



	/* For use by REJECT target */

	ip_ct_attach = __nf_conntrack_attach;



	/* Set up fake conntrack:

	    - to never be deleted, not in any hashes */

	atomic_set(&nf_conntrack_untracked.ct_general.use, 1);