Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[~andy/linux] / net / ipv6 / ping.c

diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
index 10b975577e91ac872a399a7d7a5dec0a507d4818..18f19df4189f19734564b5fcfbd46ec22b67a1e8 100644 (file)
--- a/net/ipv6/ping.c
+++ b/net/ipv6/ping.c
@@ -191,7 +191,10 @@ int ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
        }
        release_sock(sk);
 
-       return err;
+       if (err)
+               return err;
+
+       return len;
 }
 
 #ifdef CONFIG_PROC_FS