Commit eca42aaf authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller

ipv6: Fix inet6_init() cleanup order

Commit 6d0bfe22
	net: ipv6: Add IPv6 support to the ping socket

introduced a change in the cleanup logic of inet6_init and
has a bug in that ipv6_packet_cleanup() may not be called.
Fix the cleanup ordering.

CC: Hannes Frederic Sowa <hannes@stressinduktion.org>
CC: Lorenzo Colitti <lorenzo@google.com>
CC: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarVlad Yasevich <vyasevich@gmail.com>
Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 029b234f
...@@ -958,10 +958,10 @@ static int __init inet6_init(void) ...@@ -958,10 +958,10 @@ static int __init inet6_init(void)
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
sysctl_fail: sysctl_fail:
ipv6_packet_cleanup(); pingv6_exit();
#endif #endif
pingv6_fail: pingv6_fail:
pingv6_exit(); ipv6_packet_cleanup();
ipv6_packet_fail: ipv6_packet_fail:
tcpv6_exit(); tcpv6_exit();
tcpv6_fail: tcpv6_fail:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment