Merge branch 'linus' into x86/gart

1 files changed, 2 insertions, 2 deletions

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 8fee9a15b2d3..3aee12310d94 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -1169,7 +1169,8 @@ static int raw6_destroy(struct sock *sk)
         lock_sock(sk);
         ip6_flush_pending_frames(sk);
         release_sock(sk);
-        return 0;
+
+        return inet6_destroy_sock(sk);
 }
 
 static int rawv6_init_sk(struct sock *sk)
@@ -1200,7 +1201,6 @@ struct proto rawv6_prot = {
         .disconnect        = udp_disconnect,
         .ioctl             = rawv6_ioctl,
         .init              = rawv6_init_sk,
-        .destroy           = inet6_destroy_sock,
         .setsockopt        = rawv6_setsockopt,
         .getsockopt        = rawv6_getsockopt,
         .sendmsg           = rawv6_sendmsg,