diff options
| author | Vlad Yasevich <vyasevich@gmail.com> | 2013-11-16 21:17:24 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-18 21:38:46 +0100 |
| commit | eca42aaf898c31db1fd04850fb4dc584c9184c49 (patch) | |
| tree | 949d1b55b85eb493b828101684386b316a70fb1e /net | |
| parent | genetlink: rename shadowed variable (diff) | |
| download | linux-eca42aaf898c31db1fd04850fb4dc584c9184c49.tar.xz linux-eca42aaf898c31db1fd04850fb4dc584c9184c49.zip | |
ipv6: Fix inet6_init() cleanup order
Commit 6d0bfe22611602f36617bc7aa2ffa1bbb2f54c67
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: Vlad Yasevich <vyasevich@gmail.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/af_inet6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 6468bda1f2b9..56ca35b30dda 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -958,10 +958,10 @@ out: #ifdef CONFIG_SYSCTL sysctl_fail: - ipv6_packet_cleanup(); + pingv6_exit(); #endif pingv6_fail: - pingv6_exit(); + ipv6_packet_cleanup(); ipv6_packet_fail: tcpv6_exit(); tcpv6_fail: |