summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2013-07-03 17:12:40 +0200
committerDavid S. Miller <davem@davemloft.net>2013-07-04 02:42:05 +0200
commitfbfe80c890a1dc521d0b629b870e32fcffff0da5 (patch)
tree1479d7ded21593663a29b33a007cbe722b10037a /net
parentnet: ipv6: add missing lock in ping_v6_sendmsg (diff)
downloadlinux-fbfe80c890a1dc521d0b629b870e32fcffff0da5.tar.xz
linux-fbfe80c890a1dc521d0b629b870e32fcffff0da5.zip
net: ipv6: fix wrong ping_v6_sendmsg return value
ping_v6_sendmsg currently returns 0 on success. It should return the number of bytes written instead. Signed-off-by: Lorenzo Colitti <lorenzo@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/ping.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
index 10b975577e91..18f19df4189f 100644
--- 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