summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2013-07-04 00:12:40 +0900
committerJianzheng Zhou <jianzheng.zhou@freescale.com>2014-03-11 09:26:04 +0800
commitc264ca84addfb73e4a22ee8971fbc33e8dbad462 (patch)
tree348711d43e50298e8e34a701836daa5e8dd1cc44
parent7a3dea7fa2c21d5595b6deaaeb00e5f5db77e97c (diff)
net: ipv6: fix wrong ping_v6_sendmsg return value
[net-next commit fbfe80c890a1dc521d0b629b870e32fcffff0da5] ping_v6_sendmsg currently returns 0 on success. It should return the number of bytes written instead. Bug: 9469865 Change-Id: I82b7d3a37ba91ad24e6dbd97a4880745ce16ad31 Signed-off-by: Lorenzo Colitti <lorenzo@google.com> Signed-off-by: David S. Miller <davem@davemloft.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 c0f329be3375..bc30c4b4e488 100644
--- a/net/ipv6/ping.c
+++ b/net/ipv6/ping.c
@@ -210,5 +210,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;
}