summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2013-07-04 00:12:40 +0900
committerGabby Lee <galee@nvidia.com>2014-01-09 17:51:24 -0800
commitaec358d727fcfec2702b828f0540a5fa8413f3e7 (patch)
tree4931b05626de7f6052d2f8f97803b7c91478dca0 /net
parente8722111e6d04aa4435ad5bb0419c3dfa19094b1 (diff)
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. Bug: 9469865 Bug 1412141 Change-Id: I14aad6018f0c3fd92dad315bc3ade04c0b3982e0 Signed-off-by: Lorenzo Colitti <lorenzo@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit 5f0fd6105f491b8b435863e98f7e96d617e3da84) Reviewed-on: http://git-master/r/336272 (cherry picked from commit 6d931659abae7575ee64b16e3c2f3ee8bd350dd1) Reviewed-on: http://git-master/r/353233 Reviewed-by: Nitin Bindal <nbindal@nvidia.com> Tested-by: Nitin Bindal <nbindal@nvidia.com> Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
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 23d35b5f73e2..a9eba0b1959d 100644
--- a/net/ipv6/ping.c
+++ b/net/ipv6/ping.c
@@ -214,5 +214,8 @@ int ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
}
release_sock(sk);
- return err;
+ if (err)
+ return err;
+
+ return len;
}