Commit 5b975bab authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

inet: frags: refactor ipv6_frag_init() 



We want to call inet_frags_init() earlier.

This is a prereq to "inet: frags: use rhashtables for reassembly units"

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 093ba729

net/ipv6/reassembly.c

+14 −11
Original line number Diff line number Diff line
@@ -742,10 +742,21 @@ int __init ipv6_frag_init(void) 
{

	int ret;



	ret = inet6_add_protocol(&frag_protocol, IPPROTO_FRAGMENT);

	ip6_frags.hashfn = ip6_hashfn;

	ip6_frags.constructor = ip6_frag_init;

	ip6_frags.destructor = NULL;

	ip6_frags.qsize = sizeof(struct frag_queue);

	ip6_frags.match = ip6_frag_match;

	ip6_frags.frag_expire = ip6_frag_expire;

	ip6_frags.frags_cache_name = ip6_frag_cache_name;

	ret = inet_frags_init(&ip6_frags);

	if (ret)

		goto out;



	ret = inet6_add_protocol(&frag_protocol, IPPROTO_FRAGMENT);

	if (ret)

		goto err_protocol;



	ret = ip6_frags_sysctl_register();

	if (ret)

		goto err_sysctl;
@@ -754,16 +765,6 @@ int __init ipv6_frag_init(void) 
	if (ret)

		goto err_pernet;



	ip6_frags.hashfn = ip6_hashfn;

	ip6_frags.constructor = ip6_frag_init;

	ip6_frags.destructor = NULL;

	ip6_frags.qsize = sizeof(struct frag_queue);

	ip6_frags.match = ip6_frag_match;

	ip6_frags.frag_expire = ip6_frag_expire;

	ip6_frags.frags_cache_name = ip6_frag_cache_name;

	ret = inet_frags_init(&ip6_frags);

	if (ret)

		goto err_pernet;

out:

	return ret;
@@ -771,6 +772,8 @@ err_pernet: 
	ip6_frags_sysctl_unregister();

err_sysctl:

	inet6_del_protocol(&frag_protocol, IPPROTO_FRAGMENT);

err_protocol:

	inet_frags_fini(&ip6_frags);

	goto out;

}