summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2013-07-04 00:12:40 +0900
committerNitin Garg <nitin.garg@freescale.com>2014-04-21 22:35:36 -0500
commit9f979fc171d6c4f499033013779d235e7907f989 (patch)
tree9bbe0e800797dba9bae44f41a9fec637317e8185 /net
parenta18de3c527fe9b04eb8181bdb1e09d6315abe8c5 (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: 12800827 Change-Id: I7ed17dc61afbb68a84908e67e44db976ec812bad 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 a6462d657c15..1f4886857b44 100644
--- a/net/ipv6/ping.c
+++ b/net/ipv6/ping.c
@@ -212,5 +212,8 @@ int ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
len);
}
- return err;
+ if (err)
+ return err;
+
+ return len;
}